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"
group by wt.id
- order by wt.create_time desc
+ order by wt.begin_date desc
limit 20
@@ -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