diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java index 3e8696c4..74b18358 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java @@ -226,8 +226,8 @@ public class AppEnterpriseInformationController extends BaseController * @return */ @ResponseBody - @GetMapping("/checkIsState/{enterpriseNumber}") - public ZDResponse checkIsState(@PathVariable("enterpriseNumber") String enterpriseNumber){ + @GetMapping("/checkIsState/{enterpriseNumber}/{id}") + public ZDResponse checkIsState(@PathVariable("enterpriseNumber") String enterpriseNumber, @PathVariable("id") String id){ // 根据加密后的企业编码查询出企业信息 System.out.println("===============================进入企业判断======================================"); EnterpriseInformation enterpriseInformation = enterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber); @@ -236,11 +236,13 @@ public class AppEnterpriseInformationController extends BaseController System.out.println("===============================二维码判断======================================"); // 通过正常企业编码查询二维码信息 QrCodeGenerateHistory params = new QrCodeGenerateHistory(); - params.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); - params.setStatus(0); - List qrCodeGenerateHistories = iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryList(params); +// params.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); +// params.setStatus(0); +// List qrCodeGenerateHistories = iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryList(params); + // 应该用过id来获取二维码信息判断是否过期 + QrCodeGenerateHistory qrCodeGenerateHistories = iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryById(id); System.out.println("===============================二维码查询======================================"); - if (null != qrCodeGenerateHistories && qrCodeGenerateHistories.size()>0) { + if (null != qrCodeGenerateHistories && qrCodeGenerateHistories.getStatus()==0) { return ZDResponse.success("二维码正常",Boolean.TRUE); } return ZDResponse.success("二维码已过期",Boolean.FALSE); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 5223a80a..44ee970a 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -157,6 +157,9 @@ AND (u.dept_id = #{deptId}) + + AND u.user_name like concat('%', #{userName}, '%') + AND u.tenant_code = #{tenantCode} diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/information/information.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/information/information.html index e9103c50..9d160436 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/information/information.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/information/information.html @@ -20,7 +20,7 @@

  • 企业类型：

    - 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 0696d3ee..670363e4 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 @@ -42,6 +42,8 @@ public class EnterpriseInformationController extends BaseController @GetMapping() public String information() { + // 因为企业类型是中文的, 所以分组统计出来 + return prefix + "/information"; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 6972e8bb..8b3b7b46 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -142,6 +142,11 @@ public class EnforcementRegistration extends BaseDomain /** 未扫码原因 */ private String enforce; + /** 预约关联id */ + private String lawId; + /** 预约关联文字 */ + private String lawText; + /** * 关键字查询 */ @@ -155,7 +160,6 @@ public class EnforcementRegistration extends BaseDomain private String lawCertificateNumText; private String lawCertificateNumTwoText; private String subsidiaryerText; - private String lawId; private int comOrOpi; private String uniteCheck; private List fileListObj; @@ -187,6 +191,13 @@ public class EnforcementRegistration extends BaseDomain */ private EnterpriseEvaluate enterpriseEvaluate; + public String getLawText() { + return lawText; + } + + public void setLawText(String lawText) { + this.lawText = lawText; + } public String getCheckCss() { return checkCss; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java index b7212c66..89c1cb59 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java @@ -100,7 +100,7 @@ public class MssqAddOrder extends MssqBaseDomain { /** * 诉求分类（个人/商事主体）： 1: 个人; 2: 商事主体 */ - private String formUserNature; + private Integer formUserNature; /** * 涉事主体 */ @@ -429,11 +429,11 @@ public class MssqAddOrder extends MssqBaseDomain { this.actCode = actCode; } - public String getFormUserNature() { + public Integer getFormUserNature() { return formUserNature; } - public void setFormUserNature(String formUserNature) { + public void setFormUserNature(Integer formUserNature) { this.formUserNature = formUserNature; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index cf776dcd..e2e8c16b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -166,6 +166,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat // enforcementRegistration.setStatus(0); resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); } + // 先清空之前的附件, 不然删除会有问题 + zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); + // 重新加入附件 if (resNum > 0 && enforcementRegistration.getFileList().size() > 0) { zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); enforcementRegistration.getFileList().forEach(res -> { @@ -195,6 +198,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat UserBean user = userApi.getUserByUserId(enforcementRegistration.getUserId()); enforcementRegistration.setUpdateTime(DateUtils.getNowDate()); int i = enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration); + // 先清空之前的附件, 不然删除会有问题 + zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); + // 重新加入附件 if (i > 0 && enforcementRegistration.getFileList().size() > 0) { zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId()); enforcementRegistration.getFileList().forEach(res -> { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index 328b0ead..8a17c9d6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -17,6 +17,7 @@ import com.zdxt.code.domain.MssqAddOrder; import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.code.service.MssqApiService; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -92,15 +93,28 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //默认工单为已受理 enterpriseComplaint.setStatus(0); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); - /*if (i > 0) { + if (i > 0) { try { // 新增民生诉求工单 MssqAddOrder mssqAddOrder = new MssqAddOrder(); +// 执法监督码【企业名称】投诉 + 投诉类型 + String topic = ""; + // 通过redId 获取企业名称 + if (StringUtils.isNotEmpty(enterpriseComplaint.getRelId())) { + EnforcementRegistration regTmp = enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); + topic = "执法监督码【"+ regTmp.getEnterpriseName() +"】投诉 " + enterpriseComplaint.getEnforceTypeText(); + + } else { + topic = "执法监督码投诉 " + enterpriseComplaint.getEnforceTypeText(); + } + mssqAddOrder.setRequestTopic(topic); + mssqAddOrder.setOrderType(1); mssqAddOrder.setRequestContent(enterpriseComplaint.getProblemDescription()); mssqAddOrder.setContactName(enterpriseComplaint.getLinkman()); mssqAddOrder.setContactTel(enterpriseComplaint.getLinkmanTel()); mssqAddOrder.setRequestArea(enterpriseComplaint.getEnterpriseAddress()); mssqAddOrder.setRequestFrom(46); + mssqAddOrder.setFormUserNature(2); mssqAddOrder.setIsSecrecy(enterpriseComplaint.getAuthorization()); if (enterpriseComplaint.getFileListObj().size() > 0) { List files = new ArrayList<>(); @@ -126,7 +140,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi } catch (Exception e) { e.printStackTrace(); } - }*/ + } if(i > 0 && enterpriseComplaint.getFileList().size() > 0){ enterpriseComplaint.getFileList().forEach(res ->{ ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); 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 407dd3b8..2e9714bf 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 @@ -18,6 +18,7 @@ import java.util.Map; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.FileUploadApi; import com.zdxt.auth.feign.UserApi; @@ -150,7 +151,13 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS i = enterpriseInformationMapper.updateEnterpriseInformationByEnterpriseNumber(enterpriseInformation); } if(i > 0){ - String text = salt; +// String text = salt; + String uuid = IdUtil.simpleUUID(); + Map jsonMap = new HashMap<>(); + jsonMap.put("salt", salt); + jsonMap.put("codeId", uuid); + jsonMap.put("type", "zfjd"); + String text = JSON.toJSONString(jsonMap); //这里设置自定义网站url String logoPath = qrCodeUrl; try { @@ -158,7 +165,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode); String upload = fileUploadApi.upload(multipartFile); - String uuid = IdUtil.simpleUUID(); +// String uuid = IdUtil.simpleUUID(); QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory(); qrCodeGenerateHistory.setId(uuid); //生成时间 @@ -345,13 +352,25 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS @Override public int insertQrCode(String num) { + // 先将与之关联的其他二维码都失效 + QrCodeGenerateHistory qrParams = new QrCodeGenerateHistory(); + qrParams.setEnterpriseNumber(num); + qrParams.setStatus(1); + iQrCodeGenerateHistoryService.updateQrCodeGenerateHistoryByNumber(qrParams); + // 通过 企业编码 获取该编码在数据库中的企业信息, 将salt拿出来做生成参数 EnterpriseInformation info = new EnterpriseInformation(); info.setEnterpriseNumber(num); List enterpriseInformations = enterpriseInformationMapper.selectEnterpriseInformationList(info); if (null != enterpriseInformations && enterpriseInformations.size() > 0) { EnterpriseInformation enterpriseInformation = enterpriseInformations.get(0); - String text = enterpriseInformation.getSalt(); +// String text = enterpriseInformation.getSalt(); + String uuid = IdUtil.simpleUUID(); + Map jsonMap = new HashMap<>(); + jsonMap.put("salt", enterpriseInformation.getSalt()); + jsonMap.put("codeId", uuid); + jsonMap.put("type", "zfjd"); + String text = JSON.toJSONString(jsonMap); //这里设置自定义网站url String logoPath = qrCodeUrl; try { @@ -359,7 +378,6 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode); String upload = fileUploadApi.upload(multipartFile); - String uuid = IdUtil.simpleUUID(); QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory(); qrCodeGenerateHistory.setId(uuid); //生成时间 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index 99ca2798..506ab5c3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -51,12 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', + AND DATE_FORMAT(create_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' WHEN QUARTER(CURDATE()) IN (2) THEN '04' WHEN QUARTER(CURDATE()) IN (3) THEN '07' ELSE '10' END) - and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', + and DATE_FORMAT(create_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '03' WHEN QUARTER(CURDATE()) IN (2) THEN '06' diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 15561ea2..bf2ddc3b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -45,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -60,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code, is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category, - bureau_dept_id,bureau_dept_name,is_evaluate + bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text from enforcement_registration @@ -190,6 +192,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bureau_dept_name, bureau_dept_id, is_evaluate, + law_id, + law_text, #{id}, @@ -232,6 +236,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{bureauDeptName}, #{bureauDeptId}, #{isEvaluate}, + #{lawId}, + #{lawText}, @@ -276,6 +282,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bureau_dept_name = #{bureauDeptName}, bureau_dept_id = #{bureauDeptId}, is_evaluate = #{isEvaluate}, + law_id = #{lawId}, + law_text = #{lawText}, where id = #{id}