diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseInformationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseInformationController.java index b8f1505f..d6eb475c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseInformationController.java @@ -54,6 +54,17 @@ public class EnterpriseInformationController extends BaseController List list = enterpriseInformationService.selectEnterpriseInformationList(enterpriseInformation); return getDataTable(list); } + /** + * 查询企业信息登记列表 + */ + @GetMapping("/queryList") + @ResponseBody + public ZDResponse queryList(EnterpriseInformation enterpriseInformation) + { + startPage(); + List list = enterpriseInformationService.selectEnterpriseInformationList(enterpriseInformation); + return ZDResponse.success("查询成功",list); + } /** * 新增企业信息登记 @@ -182,4 +193,12 @@ public class EnterpriseInformationController extends BaseController }*/ return ZDResponse.success("查询成功",enterpriseInformation); } + + @ResponseBody + @GetMapping("/queryHistoryQrCodeList") + public ZDResponse queryHistoryQrCodeList(QrCodeGenerateHistory qrCodeGenerateHistory){ + List qrCodeGenerateHistories = + iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryList(qrCodeGenerateHistory); + return ZDResponse.success("查询二维码历史记录成功",qrCodeGenerateHistories); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java index 269fc3d3..9f0db193 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementInspectionProgram.java @@ -39,6 +39,10 @@ public class EnforcementInspectionProgram extends BaseDomain /** 是否删除 0 否 1是 */ private Integer isDelete; + /** + * 是否发布 0 否 1 是 + */ + private Integer isPublish; /** * 上传文件列表 @@ -192,6 +196,14 @@ public class EnforcementInspectionProgram extends BaseDomain this.dateSearch = dateSearch; } + public Integer getIsPublish() { + return isPublish; + } + + public void setIsPublish(Integer isPublish) { + this.isPublish = isPublish; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java index dbfd3547..d29d9917 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java @@ -72,6 +72,11 @@ public class EnterpriseInformation extends BaseDomain */ private Integer isDelete; + /** + * 企业联系人电话 + */ + private String enterpriseTel; + public void setId(String id) { this.id = id; @@ -206,6 +211,14 @@ public class EnterpriseInformation extends BaseDomain this.salt = salt; } + public String getEnterpriseTel() { + return enterpriseTel; + } + + public void setEnterpriseTel(String enterpriseTel) { + this.enterpriseTel = enterpriseTel; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/QrCodeGenerateHistory.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/QrCodeGenerateHistory.java index 50e7d188..21e6a90b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/QrCodeGenerateHistory.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/QrCodeGenerateHistory.java @@ -38,6 +38,11 @@ public class QrCodeGenerateHistory extends BaseDomain */ private Integer status; + /** + * 二维码变更原因 + */ + private String reasonsChange; + public void setId(String id) { this.id = id; @@ -94,6 +99,14 @@ public class QrCodeGenerateHistory extends BaseDomain this.enterpriseName = enterpriseName; } + public String getReasonsChange() { + return reasonsChange; + } + + public void setReasonsChange(String reasonsChange) { + this.reasonsChange = reasonsChange; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java index 2999d900..48f1cfa4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java @@ -15,6 +15,23 @@ public class StatisticalVo extends BaseDomain { */ private Integer total; + /** + * 执法事项 + */ + private String lawEnforcementItem; + /** + * 执法事项ID + */ + private String lawEnforcementItemId; + + /** + * 字典名称 + */ + private String dictLabel; + /** + * 企业类型 + */ + private Integer enterpriseType; public String getLawEnforcement() { return lawEnforcement; @@ -31,4 +48,36 @@ public class StatisticalVo extends BaseDomain { public void setTotal(Integer total) { this.total = total; } + + public String getLawEnforcementItem() { + return lawEnforcementItem; + } + + public void setLawEnforcementItem(String lawEnforcementItem) { + this.lawEnforcementItem = lawEnforcementItem; + } + + public String getLawEnforcementItemId() { + return lawEnforcementItemId; + } + + public void setLawEnforcementItemId(String lawEnforcementItemId) { + this.lawEnforcementItemId = lawEnforcementItemId; + } + + public String getDictLabel() { + return dictLabel; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } + + public Integer getEnterpriseType() { + return enterpriseType; + } + + public void setEnterpriseType(Integer enterpriseType) { + this.enterpriseType = enterpriseType; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java index f5368016..0df187ce 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java @@ -50,6 +50,13 @@ public interface EnterpriseInformationMapper */ public int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation); + /** + * 修改企业登记信息 + * @param enterpriseInformation + * @return + */ + public int updateEnterpriseInformationByEnterpriseNumber(EnterpriseInformation enterpriseInformation); + /** * 删除企业信息登记 * @@ -65,4 +72,11 @@ public interface EnterpriseInformationMapper * @return 结果 */ public int deleteEnterpriseInformationByIds(String[] ids); + + /** + * 通过查询企业信息 + * @param enterpriseName + * @return + */ + public List selectEnterpriseInformationByName(String enterpriseName); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java index 35a0e0f0..f6a6ba3b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java @@ -13,4 +13,11 @@ public interface StatisticalMapper { * @return */ List StatisticalCaseload(StatisticalVo statisticalVo); + + /** + * 统计执法部门 + * @param statisticalVo + * @return + */ + List statisticalLawEnforcementItem(StatisticalVo statisticalVo); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index 289fc973..90ef7327 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -54,6 +54,9 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS @Value("${ruoyi.profile}") private String filePath; + @Value("${qr_code_url}") + private String qrCodeUrl; + @Autowired private FileUploadApi fileUploadApi; @@ -106,15 +109,15 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS public int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation) { enterpriseInformation.setCreateTime(DateUtils.getNowDate()); - enterpriseInformation.setId(IdUtil.simpleUUID()); - UserBean user = userApi.getCurrentUser(); - enterpriseInformation.setCreateBy(user.getUserName()); - enterpriseInformation.setUserId(user.getUserId()); - enterpriseInformation.setDeptId(user.getDeptId()); +// enterpriseInformation.setId(IdUtil.simpleUUID()); +// UserBean user = userApi.getCurrentUser(); +// enterpriseInformation.setCreateBy(user.getUserName()); +// enterpriseInformation.setUserId(user.getUserId()); +// enterpriseInformation.setDeptId(user.getDeptId()); //生成企业统一信用代码盐 String salt = PasswordTools.encrypt(enterpriseInformation.getEnterpriseNumber()); enterpriseInformation.setSalt(salt); - int i = enterpriseInformationMapper.insertEnterpriseInformation(enterpriseInformation); + int i = enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation); if(i > 0){ String text = salt; //这里设置自定义网站url @@ -144,8 +147,8 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS enterpriseMerchantAuthorization.setEnterpriseName(enterpriseInformation.getEnterpriseName()); enterpriseMerchantAuthorization.setId(IdUtil.simpleUUID()); enterpriseMerchantAuthorization.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); - enterpriseMerchantAuthorization.setMerchantName(user.getUserName()); - enterpriseMerchantAuthorization.setMerchantTel(user.getPhonenumber()); + enterpriseMerchantAuthorization.setMerchantName(enterpriseInformation.getLegalPerson()); + enterpriseMerchantAuthorization.setMerchantTel(enterpriseInformation.getEnterpriseTel()); iEnterpriseMerchantAuthorizationService.insertEnterpriseMerchantAuthorization(enterpriseMerchantAuthorization); } @@ -209,7 +212,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS // TODO 企业添加成功,生成企业二维码 String text = "https://www.baidu.com/s?ie=UTF-8&wd=%E7%99%BE%E5%BA%A6"; //这里设置自定义网站url - String logoPath =null; + String logoPath = qrCodeUrl; String upload = null; try { File encode = QRCodeUtil.encodeFile(text, logoPath, filePath, true); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index aa7bafb1..bee834da 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, plan_year, plan_name, enforcement_department, enforcement_department_id, enforcement_time, enforcement_area, create_time, create_by, user_id, dept_id, is_delete from enforcement_inspection_program + select id, plan_year, plan_name, enforcement_department, enforcement_department_id, enforcement_time, enforcement_area, create_time, create_by, user_id, dept_id, is_delete,is_publish from enforcement_inspection_program @@ -105,6 +106,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update enterprise_information + + enterprise_name = #{enterpriseName}, + enterprise_type = #{enterpriseType}, + enterprise_address = #{enterpriseAddress}, + legal_person = #{legalPerson}, + registered_capital = #{registeredCapital}, + establishment_time = #{establishmentTime}, + operating_term = #{operatingTerm}, + business_scope = #{businessScope}, + create_time = #{createTime}, + create_by = #{createBy}, + is_unsubscribe = #{isUnsubscribe}, + salt = #{isUnsubscribe} + + where enterprise_number = #{enterpriseNumber} + + update enterprise_information enterprise_name = #{enterpriseName}, @@ -132,5 +151,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/QrCodeGenerateHistoryMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/QrCodeGenerateHistoryMapper.xml index c50a26b9..4eada652 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/QrCodeGenerateHistoryMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/QrCodeGenerateHistoryMapper.xml @@ -10,10 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, generate_time, qr_code_url,enterprise_number,status from qr_code_generate_history + select id, generate_time, qr_code_url,enterprise_number,status,reasons_change from qr_code_generate_history + + + + + \ No newline at end of file