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/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();