diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java
index 3be1c65d..9d141824 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java
@@ -21,6 +21,10 @@ public enum PublicStateEnum {
VIDEO_OFFLINE("2", "离线"),
VIDEO_UNKNOWN("3", "未知"),
/**********************************视频设备***************************************/
+
+ /**********************************材料进场取样复试***************************************/
+ CHECK_STATE_SJ("1", "送检中"),
+ /**********************************材料进场取样复试***************************************/
COMZGS("1","子公司状态标识");
private final String code;
diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue
index 6701f6f6..1adb3b78 100644
--- a/ruoyi-ui/src/views/project/checkDetection/index.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/index.vue
@@ -27,6 +27,54 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
搜索
@@ -116,13 +166,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}
-
-
+
+
+
+
+
+
+
+
+
+
@@ -172,6 +244,43 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -206,7 +322,7 @@ import { listCheckDetection, getCheckDetection, delCheckDetection, addCheckDetec
export default {
name: "CheckDetection",
- dicts: ['check_detection_check_type'],
+ dicts: ['sys_yes_no', 'project_checking_result', 'check_detection_check_type'],
data() {
return {
// 遮罩层
@@ -236,10 +352,15 @@ export default {
projectId: null,
deptId: null,
checkType: null,
+ materialName: null,
+ usePosition: null,
+ sampleNum: null,
+ sampleUserName: null,
+ witnessUserName: null,
+ laboratoryName: null,
checkTime: null,
checkState: null,
detectionResult: null,
- detectionFile: null,
},
// 表单参数
form: {},
@@ -278,6 +399,16 @@ export default {
projectId: null,
deptId: null,
checkType: null,
+ materialName: null,
+ usePosition: null,
+ sampleNum: null,
+ qualifiedFlag: null,
+ represenNum: null,
+ sampleUser: null,
+ sampleUserName: null,
+ witnessUser: null,
+ witnessUserName: null,
+ laboratoryName: null,
checkTime: null,
checkState: null,
detectionResult: null,
diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue
index ffafb6e6..8e6a280d 100644
--- a/ruoyi-ui/src/views/project/materialSeal/index.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/index.vue
@@ -449,18 +449,16 @@ export default {
this.form.alterationFiles = fileUrls;
},
onlyFile() {
- if (this.form.contractBrand && this.form.useBrand) {
- if (this.form.contractBrand != this.form.useBrand) {
- this.isOnly = true;
- this.rules.alterationFiles[0].required = true;
- } else {
- this.isOnly = false;
- this.form.alterationFiles = null;
- this.rules.alterationFiles[0].required = false;
- }
+ if (
+ this.form.contractBrand &&
+ this.form.useBrand &&
+ this.form.contractBrand.indexOf(this.form.useBrand) == -1
+ ) {
+ this.isOnly = true;
+ this.rules.alterationFiles[0].required = true;
} else {
this.isOnly = false;
- this.form.alterationFiles = null;
+ this.alterationFiles = null;
this.rules.alterationFiles[0].required = false;
}
},
diff --git a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
index 5b4e2111..0a55a030 100644
--- a/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
@@ -369,14 +369,12 @@ export default {
if (
this.form.contractBrand &&
this.form.useBrand &&
- this.form.contractBrand != this.form.useBrand
+ this.form.contractBrand.indexOf(this.form.useBrand) == -1
) {
- console.log("qqqq");
- //this.isOnly = true;
+ this.isOnly = true;
this.rules.alterationFiles[0].required = true;
} else {
- console.log("qqqq22222");
- //this.isOnly = false;
+ this.isOnly = false;
this.alterationFiles = null;
this.rules.alterationFiles[0].required = false;
}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java
new file mode 100644
index 00000000..8e820423
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java
@@ -0,0 +1,111 @@
+package com.ruoyi.web.project.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.PublicStateEnum;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
+import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @version : V1.0
+ * @ClassName: ProjectCheckDetectionController
+ * @Description: 项目取样复试
+ * @Auther: JiangYuQi
+ * @Date: 2020/7/7 18:03
+ */
+@RestController
+@RequestMapping("/wechat/projectDetection")
+public class ProjectDetectionController extends BaseController {
+
+ @Autowired
+ ISysDictDataService sysDictDataService;
+
+ @Autowired
+ private ISurProjectCheckDetectionService surProjectCheckDetectionService;
+
+ /**
+ * 查询项目取样复试列表
+ * @param surProjectCheckDetection
+ * @return
+ */
+ @GetMapping("/list")
+ public AjaxResult list(SurProjectCheckDetection surProjectCheckDetection){
+ if(surProjectCheckDetection.getDeptId()==0){
+ surProjectCheckDetection.setDeptId(null);
+ }
+ return success(surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection));
+ }
+
+ /**
+ * 查询项目取样复试统计
+ * @param surProjectCheckDetection
+ * @return
+ */
+ @GetMapping("/queryCount")
+ public AjaxResult queryCount(SurProjectCheckDetection surProjectCheckDetection){
+ if(surProjectCheckDetection.getDeptId()==0){
+ surProjectCheckDetection.setDeptId(null);
+ }
+ return success(surProjectCheckDetectionService.queryGroupCount(surProjectCheckDetection));
+ }
+
+ /**
+ * 查询取样复试详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/info")
+ public AjaxResult info(Long id){
+ return success(surProjectCheckDetectionService.selectSurProjectCheckDetectionById(id));
+ }
+
+ /**
+ * 新增取样复试
+ * @param surProjectCheckDetection
+ * @return
+ */
+ @PostMapping("/add")
+ @Log(title = "取样复试", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody SurProjectCheckDetection surProjectCheckDetection){
+ return success(surProjectCheckDetectionService.insertSurProjectCheckDetection(surProjectCheckDetection));
+ }
+
+ /**
+ * 修改取样复试
+ * @param surProjectCheckDetection
+ * @return
+ */
+ @PostMapping("/edit")
+ @Log(title = "取样复试", businessType = BusinessType.UPDATE)
+ public AjaxResult edit(@RequestBody SurProjectCheckDetection surProjectCheckDetection){
+ return success(surProjectCheckDetectionService.updateSurProjectCheckDetection(surProjectCheckDetection));
+ }
+
+ /**
+ * 删除取样复试
+ */
+ @Log(title = "取样复试", businessType = BusinessType.DELETE)
+ @GetMapping("/remove")
+ public AjaxResult remove(@RequestParam Long id)
+ {
+ return toAjax(surProjectCheckDetectionService.deleteSurProjectCheckDetectionById(id));
+ }
+
+ /**
+ * 查询隐患类型
+ * @return
+ */
+ @GetMapping("/queryType")
+ public AjaxResult queryType(){
+ SysDictData dictData = new SysDictData();
+ dictData.setDictType("check_detection_check_type");
+ dictData.setStatus(PublicStateEnum.OK.getCode());
+ return success(sysDictDataService.selectDictDataList(dictData));
+ }
+}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java
index bd5550f9..f5602f6c 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java
@@ -53,7 +53,7 @@ public class ProjectMaterialSealController extends BaseController {
*/
@PostMapping("/add")
@Log(title = "材料封样", businessType = BusinessType.INSERT)
- public AjaxResult addTrain(@RequestBody SurProjectMaterialSeal surProjectMaterialSeal){
+ public AjaxResult add(@RequestBody SurProjectMaterialSeal surProjectMaterialSeal){
return success(surProjectMaterialSealService.insertSurProjectMaterialSeal(surProjectMaterialSeal));
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
index dc41b40e..bfb5b181 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java
@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 材料送检Controller
*
* @author JiangYuQi
- * @date 2023-08-26
+ * @date 2023-08-31
*/
@RestController
@RequestMapping("/project/checkDetection")
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
index a3c0f0ca..83452e48 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java
@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 材料送检对象 sur_project_check_detection
*
* @author JiangYuQi
- * @date 2023-08-26
+ * @date 2023-08-31
*/
public class SurProjectCheckDetection extends BaseEntity
{
@@ -32,6 +32,46 @@ public class SurProjectCheckDetection extends BaseEntity
@Excel(name = "送检类型")
private String checkType;
+ /** 材料名称 */
+ @Excel(name = "材料名称")
+ private String materialName;
+
+ /** 使用部位 */
+ @Excel(name = "使用部位")
+ private String usePosition;
+
+ /** 取样数量 */
+ @Excel(name = "取样数量")
+ private String sampleNum;
+
+ /** 提供合格证 */
+ @Excel(name = "提供合格证")
+ private String qualifiedFlag;
+
+ /** 代表数量 */
+ @Excel(name = "代表数量")
+ private String represenNum;
+
+ /** 取样人 */
+ @Excel(name = "取样人")
+ private String sampleUser;
+
+ /** 取样人名称 */
+ @Excel(name = "取样人名称")
+ private String sampleUserName;
+
+ /** 见证人 */
+ @Excel(name = "见证人")
+ private String witnessUser;
+
+ /** 见证人名称 */
+ @Excel(name = "见证人名称")
+ private String witnessUserName;
+
+ /** 实验室名称 */
+ @Excel(name = "实验室名称")
+ private String laboratoryName;
+
/** 送检时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "送检时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -49,6 +89,14 @@ public class SurProjectCheckDetection extends BaseEntity
@Excel(name = "检测报告")
private String detectionFile;
+ /** 数据状态 */
+ @Excel(name = "数据状态")
+ private String isDel;
+
+ private String checkTypeName;
+ private String projectName;
+ private String deptName;
+
public void setId(Long id)
{
this.id = id;
@@ -85,6 +133,96 @@ public class SurProjectCheckDetection extends BaseEntity
{
return checkType;
}
+ public void setMaterialName(String materialName)
+ {
+ this.materialName = materialName;
+ }
+
+ public String getMaterialName()
+ {
+ return materialName;
+ }
+ public void setUsePosition(String usePosition)
+ {
+ this.usePosition = usePosition;
+ }
+
+ public String getUsePosition()
+ {
+ return usePosition;
+ }
+ public void setSampleNum(String sampleNum)
+ {
+ this.sampleNum = sampleNum;
+ }
+
+ public String getSampleNum()
+ {
+ return sampleNum;
+ }
+ public void setQualifiedFlag(String qualifiedFlag)
+ {
+ this.qualifiedFlag = qualifiedFlag;
+ }
+
+ public String getQualifiedFlag()
+ {
+ return qualifiedFlag;
+ }
+ public void setRepresenNum(String represenNum)
+ {
+ this.represenNum = represenNum;
+ }
+
+ public String getRepresenNum()
+ {
+ return represenNum;
+ }
+ public void setSampleUser(String sampleUser)
+ {
+ this.sampleUser = sampleUser;
+ }
+
+ public String getSampleUser()
+ {
+ return sampleUser;
+ }
+ public void setSampleUserName(String sampleUserName)
+ {
+ this.sampleUserName = sampleUserName;
+ }
+
+ public String getSampleUserName()
+ {
+ return sampleUserName;
+ }
+ public void setWitnessUser(String witnessUser)
+ {
+ this.witnessUser = witnessUser;
+ }
+
+ public String getWitnessUser()
+ {
+ return witnessUser;
+ }
+ public void setWitnessUserName(String witnessUserName)
+ {
+ this.witnessUserName = witnessUserName;
+ }
+
+ public String getWitnessUserName()
+ {
+ return witnessUserName;
+ }
+ public void setLaboratoryName(String laboratoryName)
+ {
+ this.laboratoryName = laboratoryName;
+ }
+
+ public String getLaboratoryName()
+ {
+ return laboratoryName;
+ }
public void setCheckTime(Date checkTime)
{
this.checkTime = checkTime;
@@ -122,6 +260,38 @@ public class SurProjectCheckDetection extends BaseEntity
return detectionFile;
}
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getIsDel() {
+ return isDel;
+ }
+
+ public void setIsDel(String isDel) {
+ this.isDel = isDel;
+ }
+
+ public String getCheckTypeName() {
+ return checkTypeName;
+ }
+
+ public void setCheckTypeName(String checkTypeName) {
+ this.checkTypeName = checkTypeName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -129,6 +299,16 @@ public class SurProjectCheckDetection extends BaseEntity
.append("projectId", getProjectId())
.append("deptId", getDeptId())
.append("checkType", getCheckType())
+ .append("materialName", getMaterialName())
+ .append("usePosition", getUsePosition())
+ .append("sampleNum", getSampleNum())
+ .append("qualifiedFlag", getQualifiedFlag())
+ .append("represenNum", getRepresenNum())
+ .append("sampleUser", getSampleUser())
+ .append("sampleUserName", getSampleUserName())
+ .append("witnessUser", getWitnessUser())
+ .append("witnessUserName", getWitnessUserName())
+ .append("laboratoryName", getLaboratoryName())
.append("checkTime", getCheckTime())
.append("checkState", getCheckState())
.append("detectionResult", getDetectionResult())
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
index dbc1acfa..5ed64b52 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
@@ -1,13 +1,15 @@
package com.yanzhu.jh.project.mapper;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
/**
* 材料送检Mapper接口
*
* @author JiangYuQi
- * @date 2023-08-26
+ * @date 2023-08-31
*/
public interface SurProjectCheckDetectionMapper
{
@@ -59,5 +61,20 @@ public interface SurProjectCheckDetectionMapper
*/
public int deleteSurProjectCheckDetectionByIds(Long[] ids);
+ /**
+ * 分组查询检测统计
+ *
+ * @param where 材料送检
+ * @return 结果
+ */
public List groupByCheckType(SurProjectCheckDetection where);
+
+ /**
+ * 查询材料送检统计
+ *
+ * @param surProjectCheckDetection 材料送检
+ * @return 材料送检集合
+ */
+ public List> queryGroupCount(SurProjectCheckDetection surProjectCheckDetection);
+
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
index 2cb9f700..9338f8e3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
@@ -1,13 +1,15 @@
package com.yanzhu.jh.project.service;
import java.util.List;
+import java.util.Map;
+
import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
/**
* 材料送检Service接口
*
* @author JiangYuQi
- * @date 2023-08-26
+ * @date 2023-08-31
*/
public interface ISurProjectCheckDetectionService
{
@@ -59,5 +61,19 @@ public interface ISurProjectCheckDetectionService
*/
public int deleteSurProjectCheckDetectionById(Long id);
+ /**
+ * 分组查询检测统计
+ *
+ * @param where 材料送检
+ * @return 结果
+ */
public List groupByCheckType(SurProjectCheckDetection where);
+
+ /**
+ * 查询材料送检统计
+ *
+ * @param surProjectCheckDetection 材料送检
+ * @return 材料送检集合
+ */
+ public Map queryGroupCount(SurProjectCheckDetection surProjectCheckDetection);
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
index 7dd29928..de283648 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
@@ -1,6 +1,10 @@
package com.yanzhu.jh.project.service.impl;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,7 +16,7 @@ import com.ruoyi.common.utils.SecurityUtils;
* 材料送检Service业务层处理
*
* @author JiangYuQi
- * @date 2023-08-26
+ * @date 2023-08-31
*/
@Service
public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDetectionService
@@ -53,7 +57,11 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
@Override
public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
{
- surProjectCheckDetection.setCreateBy(SecurityUtils.getUsername());
+ surProjectCheckDetection.setCheckState(PublicStateEnum.CHECK_STATE_SJ.getCode());
+ surProjectCheckDetection.setIsDel(PublicStateEnum.OK.getCode());
+ if(surProjectCheckDetection.getCreateBy()==null){
+ surProjectCheckDetection.setCreateBy(SecurityUtils.getUsername());
+ }
surProjectCheckDetection.setCreateTime(DateUtils.getNowDate());
return surProjectCheckDetectionMapper.insertSurProjectCheckDetection(surProjectCheckDetection);
}
@@ -67,7 +75,9 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
@Override
public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
{
- surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
+ if(surProjectCheckDetection.getUpdateBy()==null){
+ surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
+ }
surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate());
return surProjectCheckDetectionMapper.updateSurProjectCheckDetection(surProjectCheckDetection);
}
@@ -96,8 +106,31 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
return surProjectCheckDetectionMapper.deleteSurProjectCheckDetectionById(id);
}
+ /**
+ * 分组查询检测统计
+ *
+ * @param where 材料送检
+ * @return 结果
+ */
@Override
public List groupByCheckType(SurProjectCheckDetection where) {
return surProjectCheckDetectionMapper.groupByCheckType(where);
}
+
+ /**
+ * 查询材料送检统计
+ *
+ * @param surProjectCheckDetection 材料送检
+ * @return 材料送检集合
+ */
+ public Map queryGroupCount(SurProjectCheckDetection surProjectCheckDetection){
+ List> dataList = surProjectCheckDetectionMapper.queryGroupCount(surProjectCheckDetection);
+ Map dataMap = new HashMap<>();
+ if(dataList!=null && dataList.size()>0){
+ for(Map map:dataList){
+ dataMap.put("check"+map.get("check_state"),map.get("total"));
+ }
+ }
+ return dataMap;
+ }
}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
index c804ac62..2fc07199 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
@@ -55,9 +55,11 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea
@Override
public int insertSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal)
{
+ if(surProjectMaterialSeal.getCreateBy()==null){
+ surProjectMaterialSeal.setCreateBy(SecurityUtils.getUsername());
+ }
surProjectMaterialSeal.setIsDel(PublicStateEnum.OK.getCode());
surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]);
- surProjectMaterialSeal.setCreateBy(SecurityUtils.getUsername());
surProjectMaterialSeal.setCreateTime(DateUtils.getNowDate());
return surProjectMaterialSealMapper.insertSurProjectMaterialSeal(surProjectMaterialSeal);
}
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
index b2c4b9b4..103a7525 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
@@ -3,16 +3,30 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21,57 +35,139 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, project_id, dept_id, check_type, check_time, check_state, detection_result, detection_file, create_by, create_time, update_by, update_time, remark from sur_project_check_detection
+ select spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label as check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark from sur_project_check_detection spcd
+ left join sur_project sp on spcd.project_id = sp.id
+ left join sys_dept sd on sd.dept_id = spcd.dept_id
+ left join sys_dict_data sdd on sdd.dict_type = 'check_detection_check_type' and sdd.dict_value = spcd.check_type
+
+
-
+
-
+
insert into sur_project_check_detection
project_id,
dept_id,
check_type,
+ material_name,
+ use_position,
+ sample_num,
+ qualified_flag,
+ represen_num,
+ sample_user,
+ sample_user_name,
+ witness_user,
+ witness_user_name,
+ laboratory_name,
check_time,
check_state,
detection_result,
detection_file,
+ is_del,
create_by,
create_time,
update_by,
update_time,
remark,
-
+
#{projectId},
#{deptId},
#{checkType},
+ #{materialName},
+ #{usePosition},
+ #{sampleNum},
+ #{qualifiedFlag},
+ #{represenNum},
+ #{sampleUser},
+ #{sampleUserName},
+ #{witnessUser},
+ #{witnessUserName},
+ #{laboratoryName},
#{checkTime},
#{checkState},
#{detectionResult},
#{detectionFile},
+ #{isDel},
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
#{remark},
-
+
@@ -80,10 +176,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
project_id = #{projectId},
dept_id = #{deptId},
check_type = #{checkType},
+ material_name = #{materialName},
+ use_position = #{usePosition},
+ sample_num = #{sampleNum},
+ qualified_flag = #{qualifiedFlag},
+ represen_num = #{represenNum},
+ sample_user = #{sampleUser},
+ sample_user_name = #{sampleUserName},
+ witness_user = #{witnessUser},
+ witness_user_name = #{witnessUserName},
+ laboratory_name = #{laboratoryName},
check_time = #{checkTime},
check_state = #{checkState},
detection_result = #{detectionResult},
detection_file = #{detectionFile},
+ is_del = #{isDel},
create_by = #{createBy},
create_time = #{createTime},
update_by = #{updateBy},
@@ -98,16 +205,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from sur_project_check_detection where id in
+ delete from sur_project_check_detection where id in
#{id}
+