diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 3d4f3c7e..018d8825 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -44,6 +44,7 @@ public class BaseEntity implements Serializable private String nowUser; private String nowUserName; private String projectDeptId; + private String comment; /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @@ -157,6 +158,14 @@ public class BaseEntity implements Serializable this.projectDeptId = projectDeptId; } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + public Map getParams() { if (params == null) 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 9d141824..93c58636 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 @@ -16,6 +16,16 @@ public enum PublicStateEnum { PROJECT_CHECK_POSITION_TYPE("1", "默认工序部位类型"), /**********************************项目验收***************************************/ + /**********************************审批相关***************************************/ + AUDIT_TYPE_QYFS("1", "取样复试"), + AUDIT_TYPE_CLFY("4", "材料封样"), + AUDIT_TYPE_JPYS("3", "举牌验收"), + AUDIT_TYPE_SCSL("2", "实测实量"), + AUDITINFO_DSH("1", "待审核"), + AUDITINFO_SHBH("3", "审核驳回"), + AUDITINFO_SHTG("4", "审核通过"), + /**********************************审批相关***************************************/ + /**********************************视频设备***************************************/ VIDEO_ONLINE("1", "在线"), VIDEO_OFFLINE("2", "离线"), diff --git a/ruoyi-ui/public/images/bg1.png b/ruoyi-ui/public/images/bg1.png new file mode 100644 index 00000000..15a20ac3 Binary files /dev/null and b/ruoyi-ui/public/images/bg1.png differ diff --git a/ruoyi-ui/src/api/publics.js b/ruoyi-ui/src/api/publics.js index d6817158..acbbf782 100644 --- a/ruoyi-ui/src/api/publics.js +++ b/ruoyi-ui/src/api/publics.js @@ -68,6 +68,14 @@ const selectProjectUnitUser = (query) => { }) } +const selectProjectAuditinfo = (query) => { + return request({ + url: '/publics/selectProjectAuditinfo', + method: 'get', + params: query + }) +} + export default{ getMyDeptList, getDeptTree, @@ -78,5 +86,6 @@ export default{ queryUnitList, selectProjectAllUnitUser, selectProjectUnitUser, + selectProjectAuditinfo, } diff --git a/ruoyi-ui/src/assets/images/profile1.png b/ruoyi-ui/src/assets/images/profile1.png new file mode 100644 index 00000000..b08edec9 Binary files /dev/null and b/ruoyi-ui/src/assets/images/profile1.png differ diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index 6db92828..a0cf67a1 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -38,7 +38,7 @@ >添加 - + - - - + @@ -148,6 +138,14 @@ /> + + + 登记检测结果 + 流程日志 修改 - + - + + @@ -411,10 +419,14 @@ import { findCheckDetectionCount, updateCheckDetectionResult, } from "@/api/project/checkDetection"; +import indexDrawer from "../projectAuditinfo/indexDrawer.vue"; export default { + components: { + indexDrawer, + }, props: {}, - dicts: ["sys_yes_no", "project_checking_result", "check_detection_check_type"], + dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"], data() { return { showViewer: false, @@ -470,7 +482,7 @@ export default { { required: true, message: "请选择是否提供合格证", trigger: "blur" }, ], witnessUser: [ - { required: true, message: "请选择监理单位见证人", trigger: "blur" }, + { required: true, message: "请选择监理单位监理人", trigger: "blur" }, ], laboratoryName: [ { required: true, message: "请输入实验室名称", trigger: "blur" }, @@ -479,7 +491,7 @@ export default { checkTime: [{ required: true, message: "请选择送检时间", trigger: "blur" }], }, resultrules: { - detectionResult: [{ required: true, message: "请选择检测结果", trigger: "blur" }], + detectionResult: [{ required: false, message: "请选择检测结果", trigger: "blur" }], detectionFile: [{ required: true, message: "请上传检测报告", trigger: "blur" }], }, deptUserData: [], @@ -488,6 +500,7 @@ export default { sjz: "送检中（0）", ywc: "已完成（0）", }, + checkDetectionList:[], project: null, nodes: [], unitActiveName: "", @@ -517,10 +530,13 @@ export default { this.drawerTitle = project.projectName; this.onOpen = true; this.queryParams.projectId = project.id; + this.tabs.all="全部数据（0）"; + this.tabs.sjz="送检中（0）"; + this.tabs.ywc="已完成（0）"; this.$api.publics .queryUnitList({ projectId: project.id, - unitTypes: "2,4".split(","), + unitType: 2 }) .then((d) => { this.nodes = d.rows; @@ -679,6 +695,7 @@ export default { if (valid) { // 修改取样复试检测结果 this.resultform.checkState = "2"; + this.resultform.approveStatus = "1"; updateCheckDetectionResult(this.resultform).then((response) => { this.$modal.msgSuccess("登记结果成功"); this.resultopen = false; @@ -701,7 +718,7 @@ export default { }) .catch(() => {}); }, - /** 选择见证人*/ + /** 选择监理人*/ selectWitnessUser(val) { this.deptUserData.forEach((item) => { item.userinfoList.forEach((u) => { @@ -718,7 +735,12 @@ export default { this.$download.resource(item); }); }, + /** 流程日志 */ + handleAuditinfo(row) { + row.title="材料取样复试"; + row.logType="1"; + this.$refs.indexDrawer.show(row); + } }, }; - diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index 4270e539..156a0ed8 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -48,6 +48,20 @@ /> + + + + + - + @@ -99,7 +113,7 @@ - + - + @@ -210,7 +224,7 @@ + + + - + + + + @@ -508,10 +544,14 @@ import { findCheckDetectionCount, updateCheckDetectionResult, } from "@/api/project/checkDetection"; +import indexDrawer from "../projectAuditinfo/indexDrawer.vue"; export default { name: "CheckDetection", - dicts: ["sys_yes_no", "project_checking_result", "check_detection_check_type"], + components: { + indexDrawer, + }, + dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"], data() { return { // 遮罩层 @@ -554,6 +594,7 @@ export default { checkState: null, detectionResult: null, activeName: "sjz", + approveStatus:null, }, activeName: "sjz", // 表单参数 @@ -583,7 +624,7 @@ export default { { required: true, message: "请选择是否提供合格证", trigger: "blur" }, ], witnessUser: [ - { required: true, message: "请选择监理单位见证人", trigger: "blur" }, + { required: true, message: "请选择监理单位监理人", trigger: "blur" }, ], laboratoryName: [ { required: true, message: "请输入实验室名称", trigger: "blur" }, @@ -592,7 +633,7 @@ export default { checkTime: [{ required: true, message: "请选择送检时间", trigger: "blur" }], }, resultrules: { - detectionResult: [{ required: true, message: "请选择检测结果", trigger: "blur" }], + detectionResult: [{ required: false, message: "请选择检测结果", trigger: "blur" }], detectionFile: [{ required: true, message: "请上传检测报告", trigger: "blur" }], }, deptUserData: [], @@ -767,6 +808,7 @@ export default { if (valid) { // 修改取样复试检测结果 this.resultform.checkState = "2"; + this.resultform.approveStatus = "1"; updateCheckDetectionResult(this.resultform).then((response) => { this.$modal.msgSuccess("登记结果成功"); this.resultopen = false; @@ -816,6 +858,12 @@ export default { this.$download.resource(item); }); }, + /** 流程日志 */ + handleAuditinfo(row) { + row.title="材料取样复试"; + row.logType="1"; + this.$refs.indexDrawer.show(row); + } }, }; diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue index 8e6a280d..414b7f29 100644 --- a/ruoyi-ui/src/views/project/materialSeal/index.vue +++ b/ruoyi-ui/src/views/project/materialSeal/index.vue @@ -67,6 +67,42 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + + + 搜索 - + - + {{ parseTime(scope.row.sealDate, "{y}-{m}-{d} {h}:{i}") }} + + + + + + + + + + + + 下载附件 流程日志 + 修改 - + + @@ -461,13 +477,16 @@ import { updateProjectMeasure, } from "@/api/project/projectMeasure"; import ElImageViewer from "element-ui/packages/image/src/image-viewer"; +import indexDrawer from "../projectAuditinfo/indexDrawer.vue"; export default { name: "ProjectMeasure", components: { + indexDrawer, ElImageViewer, }, dicts: [ + "project_check_status", "project_measure_type", "project_measure_info_type", "project_checking_result", @@ -532,7 +551,7 @@ export default { qualityUser: [{ required: true, message: "请选择质量专员", trigger: "blur" }], superviseUser: [{ required: true, message: "请选择监理专员", trigger: "blur" }], measureTime: [{ required: true, message: "请选择测量时间", trigger: "blur" }], - measureResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }], + measureResult: [{ required: false, message: "请选择测量结果", trigger: "blur" }], measureFiles: [{ required: false, message: "请上传测量附件", trigger: "blur" }], }, deptUserData: [], @@ -660,6 +679,7 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.approveStatus="1"; if (this.form.id != null) { updateProjectMeasure(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); @@ -727,6 +747,12 @@ export default { this.$download.resource(item); }); }, + /** 流程日志 */ + handleAuditinfo(row) { + row.title="实测实量"; + row.logType="2"; + this.$refs.indexDrawer.show(row); + } }, }; diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue index 1b7540ae..923fcfca 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue @@ -38,7 +38,7 @@ >新增 - + - + + + 下载附件 流程日志 + 修改 - + + @@ -345,13 +360,15 @@ import { updateProjectMeasure, } from "@/api/project/projectMeasure"; import ElImageViewer from "element-ui/packages/image/src/image-viewer"; +import indexDrawer from "../projectAuditinfo/indexDrawer.vue"; export default { name: "RuoyiUiProjectDeptWroksDrawer", components: { + indexDrawer, ElImageViewer, }, - dicts: ["project_measure_type", "project_checking_result", "project_measure_info_type"], + dicts: ["project_check_status","project_measure_type", "project_checking_result", "project_measure_info_type"], data() { return { showViewer: false, @@ -377,7 +394,7 @@ export default { qualityUser: [{ required: true, message: "请选择质量专员", trigger: "blur" }], superviseUser: [{ required: true, message: "请选择监理专员", trigger: "blur" }], measureTime: [{ required: true, message: "请选择测量时间", trigger: "blur" }], - measureResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }], + measureResult: [{ required: false, message: "请选择测量结果", trigger: "blur" }], measureFiles: [{ required: false, message: "请上传测量附件", trigger: "blur" }], }, projectMeasureList: [], @@ -452,7 +469,7 @@ export default { this.$api.publics .queryUnitList({ projectId: project.id, - unitTypes: "2,4".split(","), + unitType: 2 }) .then((d) => { this.nodes = d.rows; @@ -565,6 +582,7 @@ export default { submitForm() { this.$refs["form"].validate((valid) => { if (valid) { + this.form.approveStatus="1"; if (this.form.id != null) { updateProjectMeasure(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); @@ -634,7 +652,12 @@ export default { this.$download.resource(item); }); }, + /** 流程日志 */ + handleAuditinfo(row) { + row.title="实测实量"; + row.logType="2"; + this.$refs.indexDrawer.show(row); + } }, }; - diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 385bbca8..76c66e03 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -803,7 +803,6 @@ export default { checkDetectionDrawer, }, dicts: [ - "sys_check_state", "sur_project_xmjd", "project_build_type", "sys_common_isdel", diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue index 34446dc6..ede161fa 100644 --- a/ruoyi-ui/src/views/project/surProject/myIndex.vue +++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue @@ -174,7 +174,6 @@ import costOutputDrawer from '@/views/project/costOutput/costOutputDrawer.vue' export default { dicts: [ - "sys_check_state", "sur_project_xmjd", "project_build_type", "sys_common_isdel", diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAuditinfo.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAuditinfo.java new file mode 100644 index 00000000..70489d42 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAuditinfo.java @@ -0,0 +1,112 @@ +package com.yanzhu.jh.project.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 项目审核信息对象 sur_project_auditinfo + * + * @author JiangYuQi + * @date 2023-09-20 + */ +public class SurProjectAuditinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 来自类型 */ + @Excel(name = "来自类型") + private String fromType; + + /** 来自主键 */ + @Excel(name = "来自主键") + private Long fromId; + + /** 审批状态 */ + @Excel(name = "审批状态") + private String approveStatus; + + /** 数据状态 */ + @Excel(name = "数据状态") + private String isDel; + + /** 审核意见 */ + @Excel(name = "审核意见") + private String comment; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFromType(String fromType) + { + this.fromType = fromType; + } + + public String getFromType() + { + return fromType; + } + public void setFromId(Long fromId) + { + this.fromId = fromId; + } + + public Long getFromId() + { + return fromId; + } + public void setApproveStatus(String approveStatus) + { + this.approveStatus = approveStatus; + } + + public String getApproveStatus() + { + return approveStatus; + } + public void setIsDel(String isDel) + { + this.isDel = isDel; + } + + public String getIsDel() + { + return isDel; + } + public void setComment(String comment) + { + this.comment = comment; + } + + public String getComment() + { + return comment; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fromType", getFromType()) + .append("fromId", getFromId()) + .append("approveStatus", getApproveStatus()) + .append("isDel", getIsDel()) + .append("comment", getComment()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} 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 b1d949b7..6a0791b8 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 @@ -93,6 +93,10 @@ public class SurProjectCheckDetection extends BaseEntity @Excel(name = "数据状态") private String isDel; + /** 审核状态 */ + @Excel(name = "审核状态") + private String approveStatus; + private String checkTypeName; private String projectName; private String deptName; @@ -311,6 +315,14 @@ public class SurProjectCheckDetection extends BaseEntity this.checkTypeName = checkTypeName; } + public String getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(String approveStatus) { + this.approveStatus = approveStatus; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index d267c0ce..717bd58e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -101,6 +101,10 @@ public class SurProjectChecking extends BaseEntity @Excel(name = "数据状态") private Long isDel; + /** 审核状态 */ + @Excel(name = "审核状态") + private String approveStatus; + private String projectName; private String deptName; @@ -310,6 +314,14 @@ public class SurProjectChecking extends BaseEntity this.deptName = deptName; } + public String getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(String approveStatus) { + this.approveStatus = approveStatus; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java index 7c9cacc9..c8b80c82 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java @@ -69,6 +69,22 @@ public class SurProjectMaterialSeal extends BaseEntity @Excel(name = "数据状态") private String isDel; + /** 审核状态 */ + @Excel(name = "审核状态") + private String approveStatus; + + /** 封样状态 */ + @Excel(name = "封样状态") + private String materialResult; + + /** 监理人 */ + @Excel(name = "监理人") + private String witnessUser; + + /** 监理人名称 */ + @Excel(name = "监理人名称") + private String witnessUserName; + private String projectName; private String deptName; @@ -206,6 +222,38 @@ public class SurProjectMaterialSeal extends BaseEntity this.deptName = deptName; } + public String getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(String approveStatus) { + this.approveStatus = approveStatus; + } + + public String getMaterialResult() { + return materialResult; + } + + public void setMaterialResult(String materialResult) { + this.materialResult = materialResult; + } + + public String getWitnessUser() { + return witnessUser; + } + + public void setWitnessUser(String witnessUser) { + this.witnessUser = witnessUser; + } + + public String getWitnessUserName() { + return witnessUserName; + } + + public void setWitnessUserName(String witnessUserName) { + this.witnessUserName = witnessUserName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java index f8d4dca3..bdfaa6d6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java @@ -85,6 +85,10 @@ public class SurProjectMeasure extends BaseEntity @Excel(name = "数据状态") private String isDel; + /** 审核状态 */ + @Excel(name = "审核状态") + private String approveStatus; + private String projectName; private String deptName; private String measureTypeName; @@ -294,6 +298,14 @@ public class SurProjectMeasure extends BaseEntity this.measureInfoName = measureInfoName; } + public String getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(String approveStatus) { + this.approveStatus = approveStatus; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java new file mode 100644 index 00000000..6a00cfdb --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java @@ -0,0 +1,73 @@ +package com.yanzhu.jh.project.mapper; + +import java.util.List; +import java.util.Map; + +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; + +/** + * 项目审核信息Mapper接口 + * + * @author JiangYuQi + * @date 2023-09-20 + */ +public interface SurProjectAuditinfoMapper +{ + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + public SurProjectAuditinfo selectSurProjectAuditinfoById(Long id); + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息集合 + */ + public List selectSurProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息集合 + */ + public List> selectProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 新增项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + public int insertSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 修改项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + public int updateSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 删除项目审核信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + public int deleteSurProjectAuditinfoById(Long id); + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurProjectAuditinfoByIds(Long[] ids); + + public int batch(List surProjectAuditinfoList); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java new file mode 100644 index 00000000..c7711df2 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java @@ -0,0 +1,72 @@ +package com.yanzhu.jh.project.service; + +import java.util.List; +import java.util.Map; + +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; + +/** + * 项目审核信息Service接口 + * + * @author JiangYuQi + * @date 2023-09-20 + */ +public interface ISurProjectAuditinfoService +{ + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + public SurProjectAuditinfo selectSurProjectAuditinfoById(Long id); + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息集合 + */ + public List selectSurProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息集合 + */ + public List> selectProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 新增项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + public int insertSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 修改项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + public int updateSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo); + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的项目审核信息主键集合 + * @return 结果 + */ + public int deleteSurProjectAuditinfoByIds(Long[] ids); + + /** + * 删除项目审核信息信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + public int deleteSurProjectAuditinfoById(Long id); + +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java new file mode 100644 index 00000000..2a7d21b8 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java @@ -0,0 +1,124 @@ +package com.yanzhu.jh.project.service.impl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.ruoyi.common.utils.DateUtils; +import com.yanzhu.jh.project.domain.*; +import com.yanzhu.jh.project.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.project.service.ISurProjectAuditinfoService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 项目审核信息Service业务层处理 + * + * @author JiangYuQi + * @date 2023-09-20 + */ +@Service +public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoService +{ + @Autowired + private SurProjectAuditinfoMapper surProjectAuditinfoMapper; + + @Autowired + private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper; + + @Autowired + private SurProjectCheckingMapper surProjectCheckingMapper; + + @Autowired + private SurProjectMaterialSealMapper surProjectMaterialSealMapper; + + @Autowired + private SurProjectMeasureMapper surProjectMeasureMapper; + + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + @Override + public SurProjectAuditinfo selectSurProjectAuditinfoById(Long id) + { + return surProjectAuditinfoMapper.selectSurProjectAuditinfoById(id); + } + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息 + */ + @Override + public List selectSurProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo) + { + return surProjectAuditinfoMapper.selectSurProjectAuditinfoList(surProjectAuditinfo); + } + + /** + * 查询项目审核信息列表 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 项目审核信息集合 + */ + @Override + public List> selectProjectAuditinfoList(SurProjectAuditinfo surProjectAuditinfo){ + return surProjectAuditinfoMapper.selectProjectAuditinfoList(surProjectAuditinfo); + } + /** + * 新增项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + @Override + public int insertSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo) + { + surProjectAuditinfo.setCreateBy(SecurityUtils.getUsername()); + surProjectAuditinfo.setCreateTime(DateUtils.getNowDate()); + return surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + + /** + * 修改项目审核信息 + * + * @param surProjectAuditinfo 项目审核信息 + * @return 结果 + */ + @Override + public int updateSurProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo) + { + surProjectAuditinfo.setUpdateBy(SecurityUtils.getUsername()); + surProjectAuditinfo.setUpdateTime(DateUtils.getNowDate()); + return surProjectAuditinfoMapper.updateSurProjectAuditinfo(surProjectAuditinfo); + } + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的项目审核信息主键 + * @return 结果 + */ + @Override + public int deleteSurProjectAuditinfoByIds(Long[] ids) + { + return surProjectAuditinfoMapper.deleteSurProjectAuditinfoByIds(ids); + } + + /** + * 删除项目审核信息信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + @Override + public int deleteSurProjectAuditinfoById(Long id) + { + return surProjectAuditinfoMapper.deleteSurProjectAuditinfoById(id); + } + +} 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 04738202..aacfa9e8 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,11 +1,15 @@ package com.yanzhu.jh.project.service.impl; +import java.util.Date; 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 com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; +import com.yanzhu.jh.project.mapper.SurProjectAuditinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectCheckDetectionMapper; @@ -21,6 +25,9 @@ import com.ruoyi.common.utils.SecurityUtils; @Service public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDetectionService { + @Autowired + private SurProjectAuditinfoMapper surProjectAuditinfoMapper; + @Autowired private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper; @@ -78,6 +85,21 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete if(surProjectCheckDetection.getUpdateBy()==null){ surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername()); } + + //操作日志 + if(StringUtils.isNotBlank(surProjectCheckDetection.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode()); + surProjectAuditinfo.setFromId(surProjectCheckDetection.getId()); + surProjectAuditinfo.setApproveStatus(surProjectCheckDetection.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectCheckDetection.getComment())){ + surProjectAuditinfo.setComment(surProjectCheckDetection.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectCheckDetection.getUpdateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate()); return surProjectCheckDetectionMapper.updateSurProjectCheckDetection(surProjectCheckDetection); } @@ -150,4 +172,5 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete public List getList(SurProjectCheckDetection where) { return surProjectCheckDetectionMapper.getList(where); } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 5cac9392..8f1a4b0a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -8,6 +8,9 @@ import java.util.Map; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; +import com.yanzhu.jh.project.mapper.SurProjectAuditinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectCheckingMapper; @@ -23,6 +26,9 @@ import com.ruoyi.common.utils.SecurityUtils; @Service public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService { + @Autowired + private SurProjectAuditinfoMapper surProjectAuditinfoMapper; + @Autowired private SurProjectCheckingMapper surProjectCheckingMapper; @@ -105,6 +111,21 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]); surProjectChecking.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode())); surProjectChecking.setCreateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectChecking.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_JPYS.getCode()); + surProjectAuditinfo.setFromId(surProjectChecking.getId()); + surProjectAuditinfo.setApproveStatus(surProjectChecking.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectChecking.getComment())){ + surProjectAuditinfo.setComment(surProjectChecking.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectChecking.getCreateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectCheckingMapper.insertSurProjectChecking(surProjectChecking); } @@ -118,8 +139,25 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService public int updateSurProjectChecking(SurProjectChecking surProjectChecking) { surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]); - surProjectChecking.setUpdateBy(SecurityUtils.getUsername()); + if(surProjectChecking.getUpdateBy()==null){ + surProjectChecking.setUpdateBy(SecurityUtils.getUsername()); + } surProjectChecking.setUpdateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectChecking.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_JPYS.getCode()); + surProjectAuditinfo.setFromId(surProjectChecking.getId()); + surProjectAuditinfo.setApproveStatus(surProjectChecking.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectChecking.getComment())){ + surProjectAuditinfo.setComment(surProjectChecking.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectChecking.getUpdateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectCheckingMapper.updateSurProjectChecking(surProjectChecking); } 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 64384460..4393a5af 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 @@ -1,10 +1,14 @@ package com.yanzhu.jh.project.service.impl; +import java.util.Date; import java.util.List; import java.util.Map; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; +import com.yanzhu.jh.project.mapper.SurProjectAuditinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectMaterialSealMapper; @@ -20,6 +24,10 @@ import com.ruoyi.common.utils.SecurityUtils; @Service public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSealService { + + @Autowired + private SurProjectAuditinfoMapper surProjectAuditinfoMapper; + @Autowired private SurProjectMaterialSealMapper surProjectMaterialSealMapper; @@ -62,6 +70,21 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea surProjectMaterialSeal.setIsDel(PublicStateEnum.OK.getCode()); surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]); surProjectMaterialSeal.setCreateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectMaterialSeal.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_CLFY.getCode()); + surProjectAuditinfo.setFromId(surProjectMaterialSeal.getId()); + surProjectAuditinfo.setApproveStatus(surProjectMaterialSeal.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectMaterialSeal.getComment())){ + surProjectAuditinfo.setComment(surProjectMaterialSeal.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectMaterialSeal.getCreateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectMaterialSealMapper.insertSurProjectMaterialSeal(surProjectMaterialSeal); } @@ -74,9 +97,26 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea @Override public int updateSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal) { + if(surProjectMaterialSeal.getUpdateBy()==null){ + surProjectMaterialSeal.setUpdateBy(SecurityUtils.getUsername()); + } surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]); - surProjectMaterialSeal.setUpdateBy(SecurityUtils.getUsername()); surProjectMaterialSeal.setUpdateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectMaterialSeal.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_CLFY.getCode()); + surProjectAuditinfo.setFromId(surProjectMaterialSeal.getId()); + surProjectAuditinfo.setApproveStatus(surProjectMaterialSeal.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectMaterialSeal.getComment())){ + surProjectAuditinfo.setComment(surProjectMaterialSeal.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectMaterialSeal.getUpdateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectMaterialSealMapper.updateSurProjectMaterialSeal(surProjectMaterialSeal); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java index 9bb7ae2b..55591a18 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java @@ -1,10 +1,14 @@ package com.yanzhu.jh.project.service.impl; +import java.util.Date; import java.util.List; import java.util.Map; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; +import com.yanzhu.jh.project.mapper.SurProjectAuditinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.project.mapper.SurProjectMeasureMapper; @@ -20,6 +24,9 @@ import com.ruoyi.common.utils.SecurityUtils; @Service public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService { + @Autowired + private SurProjectAuditinfoMapper surProjectAuditinfoMapper; + @Autowired private SurProjectMeasureMapper surProjectMeasureMapper; @@ -62,6 +69,21 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]); surProjectMeasure.setIsDel(PublicStateEnum.OK.getCode()); surProjectMeasure.setCreateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectMeasure.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_SCSL.getCode()); + surProjectAuditinfo.setFromId(surProjectMeasure.getId()); + surProjectAuditinfo.setApproveStatus(surProjectMeasure.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectMeasure.getComment())){ + surProjectAuditinfo.setComment(surProjectMeasure.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectMeasure.getCreateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectMeasureMapper.insertSurProjectMeasure(surProjectMeasure); } @@ -74,9 +96,27 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService @Override public int updateSurProjectMeasure(SurProjectMeasure surProjectMeasure) { + if(surProjectMeasure.getCreateBy()==null){ + surProjectMeasure.setUpdateBy(SecurityUtils.getUsername()); + } + surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]); - surProjectMeasure.setUpdateBy(SecurityUtils.getUsername()); surProjectMeasure.setUpdateTime(DateUtils.getNowDate()); + + //操作日志 + if(StringUtils.isNotBlank(surProjectMeasure.getApproveStatus())){ + SurProjectAuditinfo surProjectAuditinfo = new SurProjectAuditinfo(); + surProjectAuditinfo.setFromType(PublicStateEnum.AUDIT_TYPE_SCSL.getCode()); + surProjectAuditinfo.setFromId(surProjectMeasure.getId()); + surProjectAuditinfo.setApproveStatus(surProjectMeasure.getApproveStatus()); + if(StringUtils.isNotBlank(surProjectMeasure.getComment())){ + surProjectAuditinfo.setComment(surProjectMeasure.getComment()); + } + surProjectAuditinfo.setCreateBy(surProjectMeasure.getUpdateBy()); + surProjectAuditinfo.setCreateTime(new Date()); + surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo); + } + return surProjectMeasureMapper.updateSurProjectMeasure(surProjectMeasure); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java index fd5df853..24b587ab 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java @@ -11,8 +11,10 @@ import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import com.yanzhu.jh.project.domain.SurProject; +import com.yanzhu.jh.project.domain.SurProjectAuditinfo; import com.yanzhu.jh.project.domain.SurProjectUnitInfo; import com.yanzhu.jh.project.domain.SurProjectUserinfo; +import com.yanzhu.jh.project.service.ISurProjectAuditinfoService; import com.yanzhu.jh.project.service.ISurProjectService; import com.yanzhu.jh.project.service.ISurProjectUnitInfoService; import com.yanzhu.jh.project.service.ISurProjectUserinfoService; @@ -49,6 +51,10 @@ PublicsController extends BaseController { @Autowired private ISurProjectUserinfoService surProjectUserinfoService; + @Autowired + private ISurProjectAuditinfoService surProjectAuditinfoService; + + /** * 获取部门列表 */ @@ -151,4 +157,13 @@ PublicsController extends BaseController { { return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo)); } + + /** + * 查询项目审核信息列表 + */ + @GetMapping("/selectProjectAuditinfo") + public AjaxResult selectProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo) + { + return success(surProjectAuditinfoService.selectProjectAuditinfoList(surProjectAuditinfo)); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml new file mode 100644 index 00000000..d1dc221e --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + select id, from_type, from_id, approve_status, is_del, comment, create_by, create_time, update_by, update_time, remark from sur_project_auditinfo + + + + + + + + + + insert into sur_project_auditinfo + + from_type, + from_id, + approve_status, + is_del, + comment, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{fromType}, + #{fromId}, + #{approveStatus}, + #{isDel}, + #{comment}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sur_project_auditinfo + + from_type = #{fromType}, + from_id = #{fromId}, + approve_status = #{approveStatus}, + is_del = #{isDel}, + comment = #{comment}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from sur_project_auditinfo where id = #{id} + + + + delete from sur_project_auditinfo where id in + + #{id} + + + + + insert into sur_project_auditinfo( from_type, from_id, approve_status, comment, create_by, create_time) values + + ( #{item.fromType}, #{item.fromId}, #{item.approveStatus}, #{item.comment}, #{item.createBy}, #{item.createTime}) + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index 8eaf00ad..b2a6b2ea 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -34,10 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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 ,u1.nick_name create_by_name,u2.nick_name update_by_name + 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, spcd.approve_status, u1.nick_name create_by_name,u2.nick_name update_by_name 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 @@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spcd.project_id = #{projectId} and spcd.dept_id = #{deptId} and spcd.check_type = #{checkType} + and spcd.approve_status = #{approveStatus} and spcd.material_name like concat('%', #{materialName}, '%') and spcd.use_position like concat('%', #{usePosition}, '%') and spcd.sample_num = #{sampleNum} @@ -156,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + approve_status, #{projectId}, @@ -181,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{approveStatus}, @@ -210,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + approve_status = #{approveStatus}, where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index 272543df..30a6f768 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -33,14 +33,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, project_id, dept_id, group_dept_id, check_type, main_image, image_urls, working_position_type, check_working_position, checking_num, check_result, intro, quality_user, quality_user_name, supervise_user, supervise_user_name, group_dept_user, group_dept_user_name, checking_date, checking_files, is_del, create_by, create_time, update_by, update_time, remark from sur_project_checking + select id, project_id, dept_id, group_dept_id, check_type, main_image, image_urls, working_position_type, check_working_position, checking_num, check_result, intro, quality_user, quality_user_name, supervise_user, supervise_user_name, group_dept_user, group_dept_user_name, checking_date, checking_files, is_del, create_by, create_time, update_by, update_time, remark, approve_status from sur_project_checking