From 3d8d6fb8f94ffe8a938eed94fbd5e28d276a15b9 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Sat, 12 Oct 2024 18:02:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E8=AF=89=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=85=B3=E8=81=94=E6=8A=95=E8=AF=89=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zdxt/domain/auth/Dept.java | 3 + lib/EmergencyService/pom.xml | 5 + .../AppComplaintItemController.java | 142 +++++++++++ .../controller/AppThirdLoginController.java | 2 +- .../resources/mapper/system/DeptMapper.xml | 4 +- .../main/resources/application-druidTest.yml | 71 ++++++ .../src/main/resources/application-test.yml | 111 +++++++++ .../templates/project/code/item/edit.html | 44 ++++ .../templates/project/code/item/item.html | 97 ++++++++ .../controller/ComplaintItemController.java | 146 ++++++++++++ .../com/zdxt/code/domain/ComplaintItem.java | 75 ++++++ .../domain/EnforcementCheckStatistics.java | 1 + .../zdxt/code/domain/EnterpriseComplaint.java | 25 ++ .../zdxt/code/mapper/ComplaintItemMapper.java | 76 ++++++ .../code/service/IComplaintItemService.java | 63 +++++ .../zdxt/code/service/ThirdLoginService.java | 13 +- .../impl/ComplaintItemServiceImpl.java | 106 +++++++++ .../impl/EnterpriseComplaintServiceImpl.java | 222 +++++++++++------- .../service/impl/StatisticalServiceImpl.java | 2 +- .../service/impl/ThirdLoginServiceImpl.java | 33 +++ .../resources/mapper/ComplaintItemMapper.xml | 78 ++++++ .../mapper/EnterpriseComplaintMapper.xml | 14 +- .../main/java/com/zdxt/auth/dto/DeptBean.java | 12 + 23 files changed, 1247 insertions(+), 98 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-druidTest.yml create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application-test.yml create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/edit.html create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/item.html create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintItemController.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintItem.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintItemMapper.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IComplaintItemService.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintItemServiceImpl.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintItemMapper.xml diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java index 508ecc15..a9d616c7 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java @@ -118,6 +118,9 @@ public class Dept extends BaseDomain { private String srzUnitId; private String taskId; private String systemId; + /** + * 机构统一信用代码 + */ private String creditcode; public String getSystemId() { diff --git a/lib/EmergencyService/pom.xml b/lib/EmergencyService/pom.xml index 64921bfd..64552e3c 100644 --- a/lib/EmergencyService/pom.xml +++ b/lib/EmergencyService/pom.xml @@ -352,6 +352,11 @@ EmergencyCommonmDatascope 1.0.0 + + org.jsoup + jsoup + 1.13.1 + diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java new file mode 100644 index 00000000..7aaa31aa --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppComplaintItemController.java @@ -0,0 +1,142 @@ +package com.zdxt.app.controller; + +import com.zdxt.code.domain.ComplaintItem; +import com.zdxt.code.service.IComplaintItemService; +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.List; + + +/** + * 投诉事项Controller + * + * @author ruoyi + * @date 2024-09-24 + */ +@Controller +@RequestMapping("/app/code/item") +public class AppComplaintItemController extends BaseController { + private String prefix = "code/item"; + + @Autowired + private IComplaintItemService complaintItemService; + + @GetMapping() + public String item() { + return prefix + "/item"; + } + + /** + * 查询投诉事项列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ComplaintItem complaintItem) { + startPage(); + List list = complaintItemService.selectComplaintItemList(complaintItem); + return getDataTable(list); + } + + /** + * 查询投诉事项列表 + */ + @GetMapping("/queryList") + @ResponseBody + public TableDataInfo queryList(ComplaintItem complaintItem) { + startPage(); + List list = complaintItemService.selectComplaintItemList(complaintItem); + return getDataTable(list); + } + + /** + * 新增投诉事项 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存投诉事项 + */ + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(ComplaintItem complaintItem) { + int i = complaintItemService.insertComplaintItem(complaintItem); + return i > 0 ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); + } + + /** + * 修改投诉事项 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) { + ComplaintItem complaintItem = complaintItemService.selectComplaintItemById(id); + mmap.put("complaintItem", complaintItem); + return prefix + "/edit"; + } + + /** + * 修改保存投诉事项 + */ + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(ComplaintItem complaintItem) { + int i = complaintItemService.updateComplaintItem(complaintItem); + return i > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + + /** + * 删除投诉事项 + */ + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + int i = complaintItemService.deleteComplaintItemByIds(ids); + return i > 0 ? ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); + } + + @PostMapping("/exportItem") + @ResponseBody + public void exportItem(MultipartFile file) throws Exception { +// String filePath = FileUploadUtils.getDefaultBaseDir(); +// File file1 = new File(filePath); +// file.transferTo(file1); +// File file1 = new File("C:\\Users\\soul\\Desktop\\执法监督码部署\\司法局投诉事项.xlsx"); +// JSONArray objects = ExcelUtils.readFile(file1); +// for (int i = 0; i < objects.size(); i++) { +// JSONObject jsonObject = objects.getJSONObject(i); +// ComplaintItem complaintItem = new ComplaintItem(); +// complaintItem.setComplaintItemName(jsonObject.getString("subName")); +// complaintItem.setComplaintItemCode(jsonObject.getString("itemCode")); +// complaintItem.setSubName(jsonObject.getString("subName")); +// complaintItemService.insertComplaintItem(complaintItem); +// } + } + + + public File transferToFile(MultipartFile multipartFile) { +// 选择用缓冲区来实现这个转换即使用java 创建的临时文件 使用 MultipartFile.transferto()方法 。 + File file = null; + try { + String originalFilename = multipartFile.getOriginalFilename(); + String[] filename = originalFilename.split("\\."); + file = File.createTempFile(filename[0], filename[1] + "."); + multipartFile.transferTo(file); +// file.deleteOnExit(); + } catch (IOException e) { + e.printStackTrace(); + } + return file; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index 570799e7..659e6451 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -103,7 +103,7 @@ public class AppThirdLoginController { UserToken token = new UserToken(secretName, secretKey, LoginType.PASSWORD, UserType.SYS.getType()); Subject subject = SecurityUtils.getSubject(); subject.login(token); - User user = userService.selectUserByLoginName(secretName); + User user = userService.selectClientUserByLoginName(secretName,UserType.SYS.getType()); redisCache.setCacheObject("shiro:app:"+user.getUserId(), user); // todo:这里需要将转换出来的User存redis用于做权限 return thirdLoginService.szyLogin(user.getLoginName()); } catch (Exception e) { diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index 9ff5ce51..14ae13e3 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -50,7 +50,7 @@ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,dept_type,d.kingdee_org_id,d.kingdee_org_parent_id, tenant_code, organizationId, organizationParentId, zzLevel, code, mappingUnitParentId,updateAt, createAt, description, effectOn, sequence, isDeleted, zzDisplayPath, `name`, guid, zzIsLeaf, isDisabled, - fullname, isMappingUnit, srzUnitId, taskId from sys_dept d + fullname, isMappingUnit, srzUnitId, taskId,creditcode from sys_dept d +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/item.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/item.html new file mode 100644 index 00000000..e2dfe148 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/item/item.html @@ -0,0 +1,97 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    投诉事项编码：

    + +
    • +
  • +

    投诉事项名称：

    + +
    • +
  • +

    执法主体名称：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintItemController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintItemController.java new file mode 100644 index 00000000..c6fe524a --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintItemController.java @@ -0,0 +1,146 @@ +package com.zdxt.code.controller; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zdxt.auth.common.utils.file.FileUploadUtils; +import com.zdxt.code.domain.ComplaintItem; +import com.zdxt.code.service.IComplaintItemService; +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.ExcelUtils; +import com.zdxt.common.util.IdCardCryptoUtil; +import com.zdxt.common.util.TableDataInfo; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + + +/** + * 投诉事项Controller + * + * @author ruoyi + * @date 2024-09-24 + */ +@Controller +@RequestMapping("/code/item") +public class ComplaintItemController extends BaseController { + private String prefix = "code/item"; + + @Autowired + private IComplaintItemService complaintItemService; + + @GetMapping() + public String item() { + return prefix + "/item"; + } + + /** + * 查询投诉事项列表 + */ + @RequiresPermissions("system:item:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ComplaintItem complaintItem) { + startPage(); + List list = complaintItemService.selectComplaintItemList(complaintItem); + return getDataTable(list); + } + + /** + * 新增投诉事项 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存投诉事项 + */ + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(ComplaintItem complaintItem) { + int i = complaintItemService.insertComplaintItem(complaintItem); + return i > 0 ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); + } + + /** + * 修改投诉事项 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) { + ComplaintItem complaintItem = complaintItemService.selectComplaintItemById(id); + mmap.put("complaintItem", complaintItem); + return prefix + "/edit"; + } + + /** + * 修改保存投诉事项 + */ + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(ComplaintItem complaintItem) { + int i = complaintItemService.updateComplaintItem(complaintItem); + return i > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + + /** + * 删除投诉事项 + */ + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + int i = complaintItemService.deleteComplaintItemByIds(ids); + return i > 0 ? ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); + } + + @PostMapping("/exportItem") + @ResponseBody + public void exportItem(MultipartFile file) throws Exception { +// String filePath = FileUploadUtils.getDefaultBaseDir(); +// File file1 = new File(filePath); +// file.transferTo(file1); +// File file1 = new File("C:\\Users\\soul\\Desktop\\执法监督码部署\\司法局投诉事项.xlsx"); +// JSONArray objects = ExcelUtils.readFile(file1); +// for (int i = 0; i < objects.size(); i++) { +// JSONObject jsonObject = objects.getJSONObject(i); +// ComplaintItem complaintItem = new ComplaintItem(); +// complaintItem.setComplaintItemName(jsonObject.getString("subName")); +// complaintItem.setComplaintItemCode(jsonObject.getString("itemCode")); +// complaintItem.setSubName(jsonObject.getString("subName")); +// complaintItemService.insertComplaintItem(complaintItem); +// } + } + + + public File transferToFile(MultipartFile multipartFile) { +// 选择用缓冲区来实现这个转换即使用java 创建的临时文件 使用 MultipartFile.transferto()方法 。 + File file = null; + try { + String originalFilename = multipartFile.getOriginalFilename(); + String[] filename = originalFilename.split("\\."); + file = File.createTempFile(filename[0], filename[1] + "."); + multipartFile.transferTo(file); +// file.deleteOnExit(); + } catch (IOException e) { + e.printStackTrace(); + } + return file; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintItem.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintItem.java new file mode 100644 index 00000000..9484e56c --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintItem.java @@ -0,0 +1,75 @@ +package com.zdxt.code.domain; + +import com.zdxt.common.BaseDomain; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 投诉事项对象 complaint_item + * + * @author ruoyi + * @date 2024-09-24 + */ +public class ComplaintItem extends BaseDomain +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 投诉事项编码 */ + private String complaintItemCode; + + /** 投诉事项名称 */ + private String complaintItemName; + + /** 执法主体名称 */ + private String subName; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setComplaintItemCode(String complaintItemCode) + { + this.complaintItemCode = complaintItemCode; + } + + public String getComplaintItemCode() + { + return complaintItemCode; + } + public void setComplaintItemName(String complaintItemName) + { + this.complaintItemName = complaintItemName; + } + + public String getComplaintItemName() + { + return complaintItemName; + } + public void setSubName(String subName) + { + this.subName = subName; + } + + public String getSubName() + { + return subName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("complaintItemCode", getComplaintItemCode()) + .append("complaintItemName", getComplaintItemName()) + .append("subName", getSubName()) + .toString(); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java index 04c32aef..73ceceb4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java @@ -3,6 +3,7 @@ package com.zdxt.code.domain; import com.zdxt.common.BaseDomain; import lombok.Data; +import java.util.Date; import java.util.List; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 900a3871..8eb28a12 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -81,6 +81,15 @@ public class EnterpriseComplaint extends BaseDomain */ private Integer complaintType; + /** + * 投诉事项编码 多个逗号隔开 + */ + private String complaintItemCodes; + /** + * 投诉事项编码 多个逗号隔开 + */ + private String complaintItemNames; + public String getEnforcementTime() { return enforcementTime; } @@ -372,6 +381,22 @@ public class EnterpriseComplaint extends BaseDomain this.complaintType = complaintType; } + public String getComplaintItemCodes() { + return complaintItemCodes; + } + + public void setComplaintItemCodes(String complaintItemCodes) { + this.complaintItemCodes = complaintItemCodes; + } + + public String getComplaintItemNames() { + return complaintItemNames; + } + + public void setComplaintItemNames(String complaintItemNames) { + this.complaintItemNames = complaintItemNames; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintItemMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintItemMapper.java new file mode 100644 index 00000000..c7a9b7bb --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintItemMapper.java @@ -0,0 +1,76 @@ +package com.zdxt.code.mapper; + +import com.zdxt.code.domain.ComplaintItem; + +import java.util.List; + +/** + * 投诉事项Mapper接口 + * + * @author ruoyi + * @date 2024-09-24 + */ +public interface ComplaintItemMapper +{ + /** + * 查询投诉事项 + * + * @param id 投诉事项ID + * @return 投诉事项 + */ + ComplaintItem selectComplaintItemById(String id); + + /** + * 查询投诉事项详情 + * @param code + * @return + */ + ComplaintItem selectComplaintItemByCode(String code); + + /** + * 通过统一信用代码查询投诉事项编码 + * @param code 部门统一信用代码 + * @return + */ + List selectComplaintItemCodeByNumber(String code); + + /** + * 查询投诉事项列表 + * + * @param complaintItem 投诉事项 + * @return 投诉事项集合 + */ + List selectComplaintItemList(ComplaintItem complaintItem); + + /** + * 新增投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + int insertComplaintItem(ComplaintItem complaintItem); + + /** + * 修改投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + int updateComplaintItem(ComplaintItem complaintItem); + + /** + * 删除投诉事项 + * + * @param id 投诉事项ID + * @return 结果 + */ + int deleteComplaintItemById(String id); + + /** + * 批量删除投诉事项 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteComplaintItemByIds(String[] ids); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IComplaintItemService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IComplaintItemService.java new file mode 100644 index 00000000..e339167b --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IComplaintItemService.java @@ -0,0 +1,63 @@ +package com.zdxt.code.service; + + +import com.zdxt.code.domain.ComplaintItem; + +import java.util.List; + +/** + * 投诉事项Service接口 + * + * @author ruoyi + * @date 2024-09-24 + */ +public interface IComplaintItemService +{ + /** + * 查询投诉事项 + * + * @param id 投诉事项ID + * @return 投诉事项 + */ + ComplaintItem selectComplaintItemById(String id); + + /** + * 查询投诉事项列表 + * + * @param complaintItem 投诉事项 + * @return 投诉事项集合 + */ + List selectComplaintItemList(ComplaintItem complaintItem); + + /** + * 新增投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + int insertComplaintItem(ComplaintItem complaintItem); + + /** + * 修改投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + int updateComplaintItem(ComplaintItem complaintItem); + + /** + * 批量删除投诉事项 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + int deleteComplaintItemByIds(String ids); + + /** + * 删除投诉事项信息 + * + * @param id 投诉事项ID + * @return 结果 + */ + int deleteComplaintItemById(String id); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java index 0d40c1ed..a79ae572 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java @@ -30,10 +30,17 @@ public interface ThirdLoginService { void siqTestLogin(String userId,String userName); - /** - * 查询是否为执法人员 + /**查询是否为执法人员 + * * @param userIdCard * @return */ - public Boolean checkIsLawOfficer(String userIdCard); + Boolean checkIsLawOfficer(String userIdCard); + + /** + * 获取市场监督管理局H5页面企业信息 + * @param url + * @return + */ + String getSjEnterpriseInfo(String url); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintItemServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintItemServiceImpl.java new file mode 100644 index 00000000..9aef8d23 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintItemServiceImpl.java @@ -0,0 +1,106 @@ +package com.zdxt.code.service.impl; + +import java.util.List; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.IdUtil; +import com.zdxt.code.domain.ComplaintItem; +import com.zdxt.code.mapper.ComplaintItemMapper; +import com.zdxt.code.service.IComplaintItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 投诉事项Service业务层处理 + * + * @author ruoyi + * @date 2024-09-24 + */ +@Service +public class ComplaintItemServiceImpl implements IComplaintItemService +{ + @Autowired + private ComplaintItemMapper complaintItemMapper; + + /** + * 查询投诉事项 + * + * @param id 投诉事项ID + * @return 投诉事项 + */ + @Override + public ComplaintItem selectComplaintItemById(String id) + { + return complaintItemMapper.selectComplaintItemById(id); + } + + /** + * 查询投诉事项列表 + * + * @param complaintItem 投诉事项 + * @return 投诉事项 + */ + @Override + public List selectComplaintItemList(ComplaintItem complaintItem) + { + return complaintItemMapper.selectComplaintItemList(complaintItem); + } + + /** + * 新增投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + @Override + public int insertComplaintItem(ComplaintItem complaintItem) + { + ComplaintItem complaintItem1 = + complaintItemMapper.selectComplaintItemByCode(complaintItem.getComplaintItemCode()); + if(BeanUtil.isNotEmpty(complaintItem1)){ + complaintItem.setId(complaintItem1.getId()); + return complaintItemMapper.updateComplaintItem(complaintItem); + }else{ + complaintItem.setId(IdUtil.simpleUUID()); + return complaintItemMapper.insertComplaintItem(complaintItem); + } + } + + /** + * 修改投诉事项 + * + * @param complaintItem 投诉事项 + * @return 结果 + */ + @Override + public int updateComplaintItem(ComplaintItem complaintItem) + { + return complaintItemMapper.updateComplaintItem(complaintItem); + } + + /** + * 删除投诉事项对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteComplaintItemByIds(String ids) + { + return complaintItemMapper.deleteComplaintItemByIds(Convert.toStrArray(ids)); + } + + /** + * 删除投诉事项信息 + * + * @param id 投诉事项ID + * @return 结果 + */ + @Override + public int deleteComplaintItemById(String id) + { + return complaintItemMapper.deleteComplaintItemById(id); + } +} 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 48324e26..7efe69d1 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 @@ -8,16 +8,22 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.code.domain.*; +import com.zdxt.code.mapper.ComplaintItemMapper; import com.zdxt.code.mapper.EnforcementRegistrationMapper; +import com.zdxt.code.service.IComplaintItemService; 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.apache.commons.compress.utils.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnterpriseComplaintMapper; @@ -32,6 +38,8 @@ import com.zdxt.code.service.IEnterpriseComplaintService; @Service public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintService { + + private static final Logger log = LoggerFactory.getLogger(IEnterpriseComplaintService.class); @Autowired private EnterpriseComplaintMapper enterpriseComplaintMapper; @@ -46,6 +54,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Autowired private MssqApiService mssqApiService; + @Autowired + private DeptApi deptApi; + + @Autowired + private ComplaintItemMapper complaintItemMapper; /** * 查询企业执法-在线投诉 @@ -63,32 +76,14 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getBureauDeptName())){ enterpriseComplaint.setBureauDeptName(enforcementRegistration.getBureauDeptName()); enterpriseComplaint.setBureauDeptId(enforcementRegistration.getBureauDeptId()); + // 获取相关事项 - 执法事项 + enterpriseComplaint.setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText()); + }else{ + enterpriseComplaint.setLawEnforcementIncident("无"); } - // 获取相关事项 - 执法事项 - enterpriseComplaint.setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText()); - //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码 -// if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ -// -// //查询工单处置流程信息 -// MssqAddOrder mssqAddOrder = new MssqAddOrder(); -// mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); -// String s = null; -// try { -// //查询进度详细信息 TODO 异常捕捉之后，前端超时 -// s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); -// JSONObject jsonObject = JSONObject.parseObject(s); -// //获取进度数据 -// List approveDatas1 = -// JSONArray.parseArray(jsonObject.getString("approveDatas"), MssqOrderFlow.class); -// //列表排序反转 -// Collections.reverse(approveDatas1); -// enterpriseComplaint.setMssqOrderFlows(approveDatas1); -// } catch (Exception e) { -// e.printStackTrace(); -// } -//// System.out.println(s); -// } + }else{ + enterpriseComplaint.setLawEnforcementIncident("无"); } return enterpriseComplaint; } @@ -97,31 +92,32 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi public List selectEnterpriseComplaintProcess(String id) { EnterpriseComplaint enterpriseComplaint = enterpriseComplaintMapper.selectEnterpriseComplaintById(id); - if(StringUtils.isNotEmpty(enterpriseComplaint.getRelId())){ - EnforcementRegistration enforcementRegistration = - enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); + if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ + log.info("查询投诉信息：{}",JSONObject.toJSONString(enterpriseComplaint)); //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码 - if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){ - //查询工单处置流程信息 - MssqAddOrder mssqAddOrder = new MssqAddOrder(); - mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); - String s = null; - try { - //查询进度详细信息 TODO 异常捕捉之后，前端超时 - s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); - JSONObject jsonObject = JSONObject.parseObject(s); - //获取进度数据 - List approveDatas1 = - JSONArray.parseArray(jsonObject.getString("approveDatas"), MssqOrderFlow.class); - //列表排序反转 - Collections.reverse(approveDatas1); - enterpriseComplaint.setMssqOrderFlows(approveDatas1); - return approveDatas1; - } catch (Exception e) { - e.printStackTrace(); - } + log.info("查询工单编码：{}",enterpriseComplaint.getProWoCode()); + //查询工单处置流程信息 + MssqAddOrder mssqAddOrder = new MssqAddOrder(); + mssqAddOrder.setProWoCode(enterpriseComplaint.getProWoCode()); + String s = null; + try { + //查询进度详细信息 TODO 异常捕捉之后，前端超时 + s = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo"); + log.info("查询工单信息结果返回：{}",s); + JSONObject jsonObject = JSONObject.parseObject(s); + //获取进度数据 + List approveDatas1 = + JSONArray.parseArray(jsonObject.getString("approveDatas"), MssqOrderFlow.class); + //列表排序反转 + Collections.reverse(approveDatas1); + enterpriseComplaint.setMssqOrderFlows(approveDatas1); + return approveDatas1; + } catch (Exception e) { + e.printStackTrace(); + log.info("查询工单信息结果异常,{}",s); } + } return Lists.newArrayList(); } @@ -179,54 +175,50 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //默认工单为已受理 enterpriseComplaint.setStatus(0); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); + List proCodeList = new ArrayList<>(); 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<>(); - for (int z=0; z strings = Arrays.asList(split); + strings.forEach(res ->{ + //查询所在部门 + DeptBean deptById = deptApi.getDeptById(res); + //匹配民生诉求事项编码 + String itemCode = ""; + if(StringUtils.isNotEmpty(deptById.getCreditcode())){ + List complaintItems = + complaintItemMapper.selectComplaintItemCodeByNumber(deptById.getCreditcode()); + if(complaintItems.size() > 0 ){ + itemCode = complaintItems.get(0).getComplaintItemCode(); + } } - mssqAddOrder.setFileDatas(files); - } - String jsonStr = mssqApiService.addMssqOrder(mssqAddOrder); - JSONObject json = JSONObject.parseObject(jsonStr); - String proWoCode = json.getString("proWoCode"); - enterpriseComplaint.setProWoCode(proWoCode); - enterpriseComplaintMapper.updateEnterpriseComplaint(enterpriseComplaint); - System.out.println("===== 民生诉求新增工单 ====>: "+ jsonStr); - } catch (Exception e) { - e.printStackTrace(); + String prwCode = addMssqOrder(enterpriseComplaint,itemCode); + proCodeList.add(prwCode); + }); + }else{ + List deptNameList = new ArrayList<>(); + List deptIdsList = new ArrayList<>(); + String[] split = enterpriseComplaint.getComplaintItemCodes().split(","); + List strings = Arrays.asList(split); + strings.forEach(res ->{ + String substring = res.substring(0, 18); + //查询所在部门 + DeptBean deptBean = deptApi.selectDeptByCreditcode(substring); + if(BeanUtil.isNotEmpty(deptBean) && StringUtils.isNotEmpty(deptBean.getDeptName())){ + deptNameList.add(deptBean.getDeptName()); + deptIdsList.add(deptBean.getDeptId()); + } + String prwCode = addMssqOrder(enterpriseComplaint,res); + proCodeList.add(prwCode); + }); + enterpriseComplaint.setComplaintDepartments(String.join(",",deptNameList)); + enterpriseComplaint.setComplaintDepartmentIds(String.join(",",deptIdsList)); } + //投诉工单返回参数 + enterpriseComplaint.setProWoCode(String.join(",",proCodeList)); + enterpriseComplaintMapper.updateEnterpriseComplaint(enterpriseComplaint); } + if(i > 0 && enterpriseComplaint.getFileList().size() > 0){ enterpriseComplaint.getFileList().forEach(res ->{ ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); @@ -287,4 +279,54 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi { return enterpriseComplaintMapper.deleteEnterpriseComplaintById(id); } + + public String addMssqOrder(EnterpriseComplaint enterpriseComplaint,String itemCode ){ + 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.setActCode(itemCode); + mssqAddOrder.setIsSecrecy(enterpriseComplaint.getAuthorization()); + if (enterpriseComplaint.getFileListObj().size() > 0) { + List files = new ArrayList<>(); + for (int z=0; z: "+ jsonStr); + return proWoCode; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java index b07ab1d1..cc04eda1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java @@ -55,7 +55,7 @@ public class StatisticalServiceImpl implements StatisticalService StatisticalVo statisticalVos3 = statisticalMapper.statisticalToMouth(statisticalVo); Map dataList = new HashMap<>(); - dataList.put("item",statisticalVos); +// dataList.put("item",statisticalVos); dataList.put("enterpriseType",statisticalVos1); dataList.put("lawEnforcer",statisticalVos2); dataList.put("mouth",statisticalVos3); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index 899409c5..b57af4de 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -22,14 +22,22 @@ import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.UserConstants; import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -324,4 +332,29 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { } return Boolean.FALSE; } + + @Override + public String getSjEnterpriseInfo(String url) { + HttpClient httpClient = HttpClients.createDefault(); +// HttpGet pmethod = new HttpGet("https://qr.szcredit.org.cn/GJQYCredit/GSZJGSPT/QYGS_Jump.aspx?rid=836E3C11540954A7A32077D8E724981E995A0B0521B91F8ECB1984EF3C175A05189FF39173BB0049"); + HttpGet pmethod = new HttpGet(url); + pmethod.addHeader("Connection", "keep-alive"); + pmethod.addHeader("Cache-Control", "max-age=0"); + pmethod.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) "); + pmethod.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/;q=0.8"); + HttpResponse response = null; + String s = null; + try { + response = httpClient.execute(pmethod); + s = EntityUtils.toString(response.getEntity(), "utf-8"); + Document doc = Jsoup.parse(s); + String lblEntSCCode = doc.select("#lblEntSCCode").text(); + log.info("获取营业执照二维码信息成功，统一信用代码为：{}",lblEntSCCode); + return lblEntSCCode; + } catch (IOException e) { + e.printStackTrace(); + log.info("获取营业执照二维码页面信息失败,失败信息：{}",s); + } + return null; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintItemMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintItemMapper.xml new file mode 100644 index 00000000..16fd268e --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintItemMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + select id, complaint_item_code, complaint_item_name, sub_name from complaint_item + + + + + + + + + + + insert into complaint_item + + id, + complaint_item_code, + complaint_item_name, + sub_name, + + + #{id}, + #{complaintItemCode}, + #{complaintItemName}, + #{subName}, + + + + + update complaint_item + + complaint_item_code = #{complaintItemCode}, + complaint_item_name = #{complaintItemName}, + sub_name = #{subName}, + + where id = #{id} + + + + delete from complaint_item where id = #{id} + + + + delete from complaint_item where id in + + #{id} + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 60295779..1afb8075 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -24,13 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, rel_id, enforce_type, problem_description, enterprise_address, linkman, linkman_tel, com_or_opi, authorization, create_time, pro_wo_code,enterprise_number, enterprise_name,status,evaluate_time,complaint_departments,complaint_department_ids, - enforcement_time,complaint_type + enforcement_time,complaint_type,complaint_item_codes,complaint_item_names from enterprise_complaint @@ -100,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" complaint_department_ids, enforcement_time, complaint_type, + complaint_item_codes, + complaint_item_names, #{id}, @@ -119,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{complaintDepartmentIds}, #{enforcementTime}, #{complaintType}, + #{complaintItemCodes}, + #{complaintItemNames}, @@ -135,6 +141,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" authorization = #{authorization}, create_time = #{createTime}, pro_wo_code = #{proWoCode}, + + complaint_item_codes = #{complaintItemCodes}, + + + complaint_item_names = #{complaintItemNames}, + where id = #{id} diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java index 391d1b74..73db6c0f 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java @@ -116,6 +116,10 @@ public class DeptBean extends BaseDomain { */ private String deptType; + /** + * 机构统一信用代码 + */ + private String creditcode; public String getDeptId() { return deptId; @@ -239,6 +243,14 @@ public class DeptBean extends BaseDomain { this.deptType = deptType; } + public String getCreditcode() { + return creditcode; + } + + public void setCreditcode(String creditcode) { + this.creditcode = creditcode; + } + @Override public String toString() { return "DeptBean{" +