diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html new file mode 100644 index 00000000..fd91aa12 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/add.html @@ -0,0 +1,178 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html new file mode 100644 index 00000000..ea27b235 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html @@ -0,0 +1,179 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html new file mode 100644 index 00000000..697ebbee --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -0,0 +1,205 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    执法部门：

    + +
    • +
  • +

    企业名称：

    + +
    • +
  • +

    企业税号：

    + +
    • +
  • +

    执法时间：

    + + - + +
    • +
  • +

    执法人员姓名：

    + +
    • +
  • +

    执法结果 0 合格 1 不合格：

    + +
    • +
  • +

    登记编号：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+ + + + + + + + + +
+
+
+
+
+
+ + + + \ No newline at end of file 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 ea6e571b..134fe612 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 @@ -89,6 +89,10 @@ public class EnforcementRegistration extends BaseDomain /** 是否删除 0 否 1 是 */ private Integer isDelete; + /** + * 是否投诉 + */ + private Integer isComplaint; /** * 文件几个 @@ -113,6 +117,11 @@ public class EnforcementRegistration extends BaseDomain */ private String endTime; + /** + * 关键字查询 + */ + private String searchText; + public String getId() { return id; } @@ -338,4 +347,20 @@ public class EnforcementRegistration extends BaseDomain public void setDateSearch(String dateSearch) { this.dateSearch = dateSearch; } + + public String getSearchText() { + return searchText; + } + + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public Integer getIsComplaint() { + return isComplaint; + } + + public void setIsComplaint(Integer isComplaint) { + this.isComplaint = isComplaint; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index a8491cc3..56f0fe6d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -71,7 +71,7 @@ public class EnterpriseLawEnforcement extends BaseDomain /** * 搜索关键字 */ - private String searchText; + private String searchValue; /** * 日期查询 */ @@ -260,12 +260,14 @@ public class EnterpriseLawEnforcement extends BaseDomain this.remark = remark; } - public String getSearchText() { - return searchText; + @Override + public String getSearchValue() { + return searchValue; } - public void setSearchText(String searchText) { - this.searchText = searchText; + @Override + public void setSearchValue(String searchValue) { + this.searchValue = searchValue; } public String getSearchDate() { 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 4448d498..62c46ff1 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 @@ -7,6 +7,8 @@ import cn.hutool.core.util.IdUtil; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.common.util.DateUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +35,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Autowired private UserApi userApi; + @Autowired + private EnforcementRegistrationMapper enforcementRegistrationMapper; + /** * 查询企业执法-在线投诉 * @@ -81,6 +86,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi zdxtFileCommon.setUploadPersonId(user.getUserId().toString()); zdxtFileCommon.setUploadPersonName(user.getUserName()); zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon); + //修改执法记录状态为已投诉 + EnforcementRegistration enforcementRegistration = new EnforcementRegistration(); + enforcementRegistration.setIsComplaint(1); + enforcementRegistration.setId(enterpriseComplaint.getRelId()); + enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration); }); } return i; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 3e482e42..3f880e9e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -73,7 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( enterprise_name like concat(concat('%',#{searchValue}),'%') or law_enforcement_code like concat(concat('%',#{searchValue}),'%') - or law_enforcer_tel like concat(concat('%',#{searchValue}),'%') + or law_enforcer like concat(concat('%',#{searchValue}),'%') + or law_enforcement_item like concat(concat('%',#{searchValue}),'%') + or law_enforcement like concat(concat('%',#{searchValue}),'%') ) @@ -212,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from enforcement_registration where id in + delete from enforcement_registration where id in #{id} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index 11ee115e..df987e25 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( enterprise_name like concat(concat('%',#{searchValue}),'%') or law_enforcement_code like concat(concat('%',#{searchValue}),'%') - or link_tel like concat(concat('%',#{searchValue}),'%') or check_item like concat(concat('%',#{searchValue}),'%') + or law_enforcement like concat(concat('%',#{searchValue}),'%') )