From 30bc3affd926bb5e6e14d0acf19b354d57c30ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= Date: Fri, 30 Dec 2022 15:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=95=B0=E6=8D=AE=E5=92=8C?= =?UTF-8?q?=E5=B1=A5=E8=81=8C=E8=AE=B0=E5=BD=95=E4=BB=BB=E5=8A=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/bean/ent/CompaniesDto.java | 11 +++ .../java/com/rzyc/bean/ent/CompanyEntNum.java | 68 ++++++++++++++ .../rzyc/mapper/ent/SysEnterpriseMapper.java | 9 ++ .../java/com/rzyc/model/user/ListDetail.java | 22 +++++ .../mapper/ent/SysEnterpriseMapper.xml | 26 ++++++ .../mapper/user/ListDetailMapper.xml | 13 ++- .../rzyc/controller/PcPersonalController.java | 4 +- .../controller/ent/PcCompanyController.java | 90 ++++++++++++++++++- 8 files changed, 235 insertions(+), 8 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/bean/ent/CompanyEntNum.java diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ent/CompaniesDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ent/CompaniesDto.java index ef5c442..b721606 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/ent/CompaniesDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/ent/CompaniesDto.java @@ -31,6 +31,17 @@ public class CompaniesDto { @ApiModelProperty("行业id") private String baseinclassid; + @ApiModelProperty("数据类型 1、静态风险 2、动态风险") + private Integer dataType; + + public Integer getDataType() { + return dataType; + } + + public void setDataType(Integer dataType) { + this.dataType = dataType; + } + public String getBaseinclassid() { return baseinclassid; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ent/CompanyEntNum.java b/inventory-dao/src/main/java/com/rzyc/bean/ent/CompanyEntNum.java new file mode 100644 index 0000000..fda5158 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ent/CompanyEntNum.java @@ -0,0 +1,68 @@ +package com.rzyc.bean.ent; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author dong + * @date 2022-12-30 10:40 + * @Version V1.0 + */ +@ApiModel("企业数量") +public class CompanyEntNum { + + @ApiModelProperty("企业总数") + private Integer totalNum; + + @ApiModelProperty("红色企业数") + private Integer redNum; + + @ApiModelProperty("橙色企业数") + private Integer orangeNum; + + @ApiModelProperty("黄色企业数") + private Integer yellowNum; + + @ApiModelProperty("蓝色企业数") + private Integer blueNum; + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public Integer getRedNum() { + return redNum; + } + + public void setRedNum(Integer redNum) { + this.redNum = redNum; + } + + public Integer getOrangeNum() { + return orangeNum; + } + + public void setOrangeNum(Integer orangeNum) { + this.orangeNum = orangeNum; + } + + public Integer getYellowNum() { + return yellowNum; + } + + public void setYellowNum(Integer yellowNum) { + this.yellowNum = yellowNum; + } + + public Integer getBlueNum() { + return blueNum; + } + + public void setBlueNum(Integer blueNum) { + this.blueNum = blueNum; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java index bde9124..5150bc1 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java @@ -109,6 +109,7 @@ public interface SysEnterpriseMapper extends BaseMapper { /*所有企业*/ List findByAreaCode(@Param("areaCode") String areaCode); + /*企业列表*/ ListselectPCList(@Param("areaCode") String areaCode, @Param("entName")String entName, @Param("riskLevel")String riskLevel, @@ -116,6 +117,14 @@ public interface SysEnterpriseMapper extends BaseMapper { @Param("baseinclassid") String baseinclassid, @Param("inherentRisks") List inherentRisks); + /*企业数量*/ + Integer countCompany(@Param("areaCode") String areaCode, + @Param("entName")String entName, + @Param("riskLevel")String riskLevel, + @Param("isAdmin") Integer isAdmin, + @Param("baseinclassid") String baseinclassid, + @Param("inherentRisks") List inherentRisks); + /*小程序企业列表*/ ListwechatEnt(@Param("orgCode") String orgCode, @Param("entName")String entName, diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java index b2ca863..fa0f06e 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListDetail.java @@ -45,6 +45,12 @@ public class ListDetail implements Serializable { private String isfinish; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("任务名") + private String taskName; + /** * 删除状态 */ @@ -76,6 +82,22 @@ public class ListDetail implements Serializable { private static final long serialVersionUID = 1L; + public String getTaskName() { + return taskName; + } + + public void setTaskName(String taskName) { + this.taskName = taskName; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + public String getSysUserId() { return sysUserId; } diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml index 0cd41e8..c22b9c3 100644 --- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml @@ -839,6 +839,32 @@ order by sys.ModifiedOn desc , sys.SysEnterpriseId desc + + + - SELECT ld.* FROM ListDetail ld + SELECT ld.*,ot.Subject taskName + FROM ListDetail ld LEFT JOIN ListFactor lt ON ld.`ListFactorId` = lt.ListFactorId + left join oatask ot on ld.task_id = ot.OATaskId WHERE (ld.`WorkTitle` LIKE #{condition} OR ld.`WorkCnt` LIKE #{condition}) AND lt.`ListPerformId` = #{performId} AND lt.`SysYear` = #{year} diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 585a63d..004eff6 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -453,7 +453,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { if(null != sysUser){ //更新履职进度 - getFactor(sysUser.getSystitle()); +// getFactor(sysUser.getSystitle()); UserDepart userDepart = listPerformMapper.userPerform(sysUser.getSysuserid()); @@ -1161,6 +1161,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { System.out.println("chinaName -> "+chinaName); listDetail.setCreatedby(chinaName); listDetail.setModifiedby(chinaName); + listDetail.setTaskId(addPerformRecordDto.getTaskId()); listDetail.setIsfinish(IsFinish.YES.getFinish()); listDetail.setDelState(DelState.NOT_DEL.getState()); @@ -1231,6 +1232,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStartTime(),"yyyy-MM-dd")); listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndTime(),"yyyy-MM-dd")); listDetail.setFinishtime(listDetail.getEndtime()); + listDetail.setTaskId(addPerformRecordDto.getTaskId()); String chinaName = getChinaName(); System.out.println("chinaName -> "+chinaName); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 1343411..80de8a4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -14,6 +14,7 @@ import com.rzyc.bean.check.dto.LawAddDto; import com.rzyc.bean.check.dto.TalkAddDto; import com.rzyc.bean.ent.*; import com.rzyc.bean.user.dto.WeChartLoginDto; +import com.rzyc.enums.RiskLevel; import com.rzyc.model.*; import com.rzyc.model.check.*; import com.rzyc.model.ent.EntBillCon; @@ -57,8 +58,10 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { private final String ADMIN_ID = "8D35010B-EB9A-40EE-BDEB-CDAE969D5EF4"; /** - * PC企业列表 - * @return + * 企业列表 + * @version v1.0 + * @author dong + * @date 2022/12/30 10:38 */ @ApiOperation(value = "PC企业列表", notes = "PC企业列表") @PostMapping("/companies") @@ -107,10 +110,89 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { return singleResult; } + /** - * PC企业软删除 - * @return + * 企业数量统计 + * @version v1.0 + * @author dong + * @date 2022/12/30 10:39 */ + @ApiOperation(value = "企业数量统计", notes = "企业数量统计") + @PostMapping("/companyEntNum") + @ResponseBody + public SingleResult companyEntNum(@Valid CompaniesDto companiesDto)throws Exception{ + SingleResult result = new SingleResult<>(); + + String userId = getUserId(); + + //是否为管理员账号 1:是 2：否 + Integer isAdmin = 2; + if(ADMIN_ID.equals(userId)){ + isAdmin = 1; + } + + String areaCode = companiesDto.getOrgCode(); + if(StringUtils.isBlank(areaCode)){ + areaCode = getUserArea(userId); + } + + CompanyEntNum companyEntNum = new CompanyEntNum(); + + //企业总数 + Integer totalNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),new ArrayList<>()); + companyEntNum.setTotalNum(totalNum); + + if(1 == companiesDto.getDataType()){ + //红色企业 + List redRisks = new ArrayList<>(); + redRisks.add(RiskLevel.RED.getLevel()); + Integer redNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),redRisks); + companyEntNum.setRedNum(redNum); + + //橙色企业 + List orangeRisks = new ArrayList<>(); + orangeRisks.add(RiskLevel.ORANGE.getLevel()); + Integer orangeNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),orangeRisks); + companyEntNum.setOrangeNum(orangeNum); + + //橙色企业 + List yellowRisks = new ArrayList<>(); + yellowRisks.add(RiskLevel.YELLOW.getLevel()); + Integer yellowNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),yellowRisks); + companyEntNum.setYellowNum(yellowNum); + + //橙色企业 + List blueRisks = new ArrayList<>(); + blueRisks.add(RiskLevel.BLUE.getLevel()); + Integer blueNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),companiesDto.getRiskLevel(),isAdmin,companiesDto.getBaseinclassid(),blueRisks); + companyEntNum.setBlueNum(blueNum); + }else{ + Integer redNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),RiskLevel.RED.getLevelDesc(),isAdmin,companiesDto.getBaseinclassid(),null); + companyEntNum.setRedNum(redNum); + + //橙色企业 + Integer orangeNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),RiskLevel.ORANGE.getLevelDesc(),isAdmin,companiesDto.getBaseinclassid(),null); + companyEntNum.setOrangeNum(orangeNum); + + //橙色企业 + Integer yellowNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),RiskLevel.YELLOW.getLevelDesc(),isAdmin,companiesDto.getBaseinclassid(),null); + companyEntNum.setYellowNum(yellowNum); + + //橙色企业 + Integer blueNum = sysEnterpriseMapper.countCompany(areaCode,companiesDto.getEntName(),RiskLevel.BLUE.getLevelDesc(),isAdmin,companiesDto.getBaseinclassid(),null); + companyEntNum.setBlueNum(blueNum); + } + + + result.setData(companyEntNum); + return result; + } + + + /** + * PC企业软删除 + * @return + */ @ApiOperation(value = "PC企业软删除", notes = "PC企业软删除") @PostMapping("/DeleteCompanies") @ResponseBody