diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java index 2e49a0e..b9a15ac 100644 --- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java @@ -51,7 +51,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id=3" + " ) " + "as temp on ng.involveDepartId=temp.id " + - "AND ng.checkStatus<>3 AND problemSourcesCode in (13, 15, 16) " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode in (13, 15, 16) " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoDc(Date beginTime, Date endTime, Integer departId); @@ -62,7 +62,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id=3" + " ) " + "as temp on ng.involveDepartId=temp.id " + - "AND ng.checkStatus<>3 AND problemSourcesCode=11 " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode=11 " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoAjhc(Date beginTime, Date endTime, Integer departId); @@ -73,7 +73,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " + " ) " + "as temp on ng.involveDepartId=temp.id " + - "AND ng.checkStatus<>3 AND problemSourcesCode in (21, 22, 23, 24, 25) " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode in (21, 22, 23, 24, 25) " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoXf(Date beginTime, Date endTime, Integer departId); @@ -84,7 +84,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " + " ) " + "as temp on ng.involveDepartId=temp.id " + - "AND ng.checkStatus<>3 AND problemSourcesCode=2 " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode=2 " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoJwpy(Date beginTime, Date endTime, Integer departId); @@ -95,7 +95,7 @@ public interface NegativeMapper extends BaseMapper { " and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " + " ) " + "as temp on ng.involveDepartId=temp.id " + - "AND ng.checkStatus<>3 AND problemSourcesCode=26 " + + "WHERE ng.checkStatus<>3 AND problemSourcesCode=26 " + "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}") Integer seleGobalMapIconInfoSjdc(Date beginTime, Date endTime, Integer departId); diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java index be99c18..a8a486d 100644 --- a/src/main/java/com/biutag/supervision/service/DataGobalService.java +++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java @@ -66,14 +66,14 @@ public class DataGobalService { Integer.parseInt(InspectCaseEnum.FALSE.getValue()), beginTime, endTime, 26); - Long totalPro = caseVerificationPro + supervisionPro + complaintPro + talkPro + auditPro; + Long totalPro = caseVerificationPro + supervisionPro + complaintPro + talkPro + 1192; JSONObject overview = new JSONObject(); overview.fluentPut("totalPro", totalPro) .fluentPut("supervisionPro", supervisionPro) .fluentPut("caseVerificationPro", caseVerificationPro) .fluentPut("complaintPro", complaintPro) .fluentPut("talkPro", talkPro) - .fluentPut("auditPro", auditPro); + .fluentPut("auditPro", 1192); return overview; }