From ef013a15380ca7aa48c44963917ec29109f434ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 1 Jul 2024 23:56:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/trouble/pshProblemmodify/index.vue | 34 +++++++++++++ .../views/trouble/sspProblemmodify/index.vue | 34 +++++++++++++ ruoyi-ui/src/views/video/videoList/index.vue | 2 +- .../controller/WcFlowLabourController.java | 2 +- .../src/main/resources/application-druid.yml | 4 +- .../src/main/resources/application.yml | 2 +- .../trouble/domain/SmzSspProblemmodify.java | 19 +++++++ .../project/SurProjectInsuranceMapper.xml | 2 +- .../trouble/SmzSspProblemmodifyMapper.xml | 49 +++++++++++++------ .../resources/mapper/work/WorkTrainMapper.xml | 8 +-- 10 files changed, 131 insertions(+), 25 deletions(-) diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue index 8a63e30e..3594baa1 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue @@ -225,6 +225,23 @@ @@ -239,6 +256,23 @@
{{ scope.row.lordSent }}
{{ scope.row.lordSentUser }}
+
+ + 集团公司 + + + 子公司 + + + 总包单位 + + + 分包单位 + + + 监理单位 + +
@@ -240,6 +257,23 @@ list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo); + List list = flowLabourInfoService.selectFlowLabourInfoListV2(flowLabourInfo); return getDataTable(list); } diff --git a/ruoyi-wechat/src/main/resources/application-druid.yml b/ruoyi-wechat/src/main/resources/application-druid.yml index a6bd9ab4..4c8da15c 100644 --- a/ruoyi-wechat/src/main/resources/application-druid.yml +++ b/ruoyi-wechat/src/main/resources/application-druid.yml @@ -51,9 +51,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root - password: Sxyanzhu@cf + password: Sxyanzhu@cf123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-wechat/src/main/resources/application.yml b/ruoyi-wechat/src/main/resources/application.yml index 07929941..13ee415f 100644 --- a/ruoyi-wechat/src/main/resources/application.yml +++ b/ruoyi-wechat/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: druid # 文件上传 servlet: multipart: diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java index 2f988529..d0cc9add 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java @@ -136,6 +136,9 @@ public class SmzSspProblemmodify extends BaseEntity private String dangerLabel; private String chkLabel; + private String zgDeptType; + private String fjDeptType; + public String getDangerLabel() { return dangerLabel; } @@ -458,6 +461,22 @@ public class SmzSspProblemmodify extends BaseEntity this.problemType = problemType; } + public String getZgDeptType() { + return zgDeptType; + } + + public void setZgDeptType(String zgDeptType) { + this.zgDeptType = zgDeptType; + } + + public String getFjDeptType() { + return fjDeptType; + } + + public void setFjDeptType(String fjDeptType) { + this.fjDeptType = fjDeptType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml index e5d0332e..2923fd52 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_unit_info spui on spui.projectId=sp.id and spui.unitType=2 left join sys_dept d on d.dept_id = spui.unitId RIGHT JOIN sys_dict_data sdd ON sdd.dict_type = 'sur_project_insurance_type' - LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id + LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id and spi.dept_id=spui.unitId AND spi.insurance_type = sdd.dict_value AND spi.is_del = 0 diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 7c311148..aa614e45 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -42,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -55,14 +57,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -434,7 +454,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dict_data sd on sd.dict_value=sp.danger_type and sd.dict_type = 'ssp_aqyhlx' and sd.dict_type = 'ssp_zlyhlx' - WHERE sp.isDel = 0 and p.progressVisible=0 and p.isDel=0 + WHERE sp.isDel = 0 and p.isDel=0 AND sp.infotype = #{infoType} AND sp.roletype=#{roleType} and DATE(sp.createtime) >= DATE(#{startDate}) @@ -461,7 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ( select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit - where infoType=#{infoType} AND isDel=0 AND progressVisible=0 + where infoType=#{infoType} AND isDel=0 and projectId=#{projectId} and proType = #{proType} AND deptid = #{deptId} @@ -480,7 +500,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join( select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) - and infoType=#{infoType} AND isDel=0 AND progressVisible=0 + and infoType=#{infoType} AND isDel=0 and projectId=#{projectId} AND deptid = #{deptId} @@ -498,7 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ( SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) < date(now()) ) - and infoType=#{infoType} AND isDel=0 AND progressVisible=0 + and infoType=#{infoType} AND isDel=0 and projectId=#{projectId} AND deptid = #{deptId} @@ -517,7 +537,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join( select projectid,count(1) comp from vw_smz_ssp_problemmodify_audit where checkState=4 - and infoType=#{infoType} AND isDel=0 AND progressVisible=0 + and infoType=#{infoType} AND isDel=0 and projectId=#{projectId} AND deptid = #{deptId} @@ -604,8 +624,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT ssp.infotype,ssp.checkState,COUNT(1) id FROM smz_ssp_problemmodify ssp left join sur_project sp on sp.id=ssp.projectId - WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0 + WHERE ssp.isDel=0 and sp.isDel=0 and ssp.infoType=#{infoType} and ssp.roleType=#{roleType} and DATE(ssp.createtime) >= DATE(#{startDate}) @@ -749,7 +768,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) cnt FROM smz_ssp_problemmodify ssp left join sur_project sp on ssp.projectId=sp.id - WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0 + WHERE ssp.isDel=0 and sp.isDel=0 and ssp.infoType=#{infoType} and ssp.roleType=#{roleType} and DATE(ssp.createtime) >= DATE(#{startDate}) diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index 4f6cb1c2..330dc765 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spu.user_id = #{nowUser} and spu.is_del=0 group by wt.id - order by wt.create_time desc + order by wt.begin_date desc @@ -306,6 +306,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by wt.id - order by wt.create_time desc + order by wt.begin_date desc \ No newline at end of file From 31ce33abc5d8078203c4823944040189bae72f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 2 Jul 2024 00:07:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/SmzSspProblemmodifyExport.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java index 673b6d54..ef41ea26 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java @@ -2,11 +2,13 @@ package com.yanzhu.jh.trouble.domain.vo; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; import java.util.Date; +import java.util.Objects; public class SmzSspProblemmodifyExport { @Excel(name = "项目名称",align= HorizontalAlignment.LEFT,width =30 ) @@ -25,16 +27,25 @@ public class SmzSspProblemmodifyExport { @Excel(name = "整改要求" ,align= HorizontalAlignment.LEFT,width =30) private String changeInfo; + @Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss") private Date nickedTime; + @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30) private String lordSent; + @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =30) + private String lordSentDeptType; + @Excel(name = "流程状态") private String checkState; @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30) private String recheckSend; + + @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =30) + private String recheckSendDeptType; + @Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30) private String copySend; @@ -60,6 +71,32 @@ public class SmzSspProblemmodifyExport { d.createBy=it.getCreateBy(); d.createTime=it.getCreateTime(); d.marksPicture= RuoYiConfig.getProjectUrl()+it.getMarksPicture(); + if(StringUtils.isNotEmpty(it.getZgDeptType())){ + if(Objects.equals(it.getZgDeptType(),"1")){ + d.lordSentDeptType="集团公司"; + }else if(Objects.equals(it.getZgDeptType(),"11")){ + d.lordSentDeptType="子公司"; + }else if(Objects.equals(it.getZgDeptType(),"2")){ + d.lordSentDeptType="总包单位"; + }else if(Objects.equals(it.getZgDeptType(),"3")){ + d.lordSentDeptType="分包单位"; + }else{ + d.lordSentDeptType="监理单位"; + } + } + if(StringUtils.isNotEmpty(it.getFjDeptType())){ + if(Objects.equals(it.getFjDeptType(),"1")){ + d.recheckSendDeptType="集团公司"; + }else if(Objects.equals(it.getFjDeptType(),"11")){ + d.recheckSendDeptType="子公司"; + }else if(Objects.equals(it.getFjDeptType(),"2")){ + d.recheckSendDeptType="总包单位"; + }else if(Objects.equals(it.getFjDeptType(),"3")){ + d.recheckSendDeptType="分包单位"; + }else{ + d.recheckSendDeptType="监理单位"; + } + } return d; } @@ -174,4 +211,20 @@ public class SmzSspProblemmodifyExport { public void setProblemType(String problemType) { this.problemType = problemType; } + + public String getLordSentDeptType() { + return lordSentDeptType; + } + + public void setLordSentDeptType(String lordSentDeptType) { + this.lordSentDeptType = lordSentDeptType; + } + + public String getRecheckSendDeptType() { + return recheckSendDeptType; + } + + public void setRecheckSendDeptType(String recheckSendDeptType) { + this.recheckSendDeptType = recheckSendDeptType; + } } From 9dd0fa9b078052b6df604ca8f0af0e557cb70744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 2 Jul 2024 00:16:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jh/trouble/domain/vo/SmzSspProblemmodifyExport.java | 8 ++++---- .../mapper/trouble/SmzSspProblemmodifyMapper.xml | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java index ef41ea26..f4d0532f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java @@ -31,19 +31,19 @@ public class SmzSspProblemmodifyExport { @Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss") private Date nickedTime; - @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30) + @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =20) private String lordSent; - @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =30) + @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =20) private String lordSentDeptType; @Excel(name = "流程状态") private String checkState; - @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30) + @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =20) private String recheckSend; - @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =30) + @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =20) private String recheckSendDeptType; @Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30) diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index aa614e45..e90b4bb5 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -788,7 +788,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"