From 4d8c654aee0842d0ea6680d4450f967c67a7b1b2 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Sun, 4 Aug 2024 18:10:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E4=BB=B7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseEvaluateController.java | 104 +++++++++++++ .../EnterpriseEvaluateController.java | 108 ++++++++++++++ .../domain/EnforcementInspectionProgram.java | 6 +- .../code/domain/EnforcementRegistration.java | 12 ++ .../zdxt/code/domain/EnterpriseEvaluate.java | 138 ++++++++++++++++++ .../code/mapper/EnterpriseEvaluateMapper.java | 62 ++++++++ .../service/IEnterpriseEvaluateService.java | 62 ++++++++ .../EnforcementRegistrationServiceImpl.java | 2 + .../impl/EnterpriseComplaintServiceImpl.java | 5 +- .../impl/EnterpriseEvaluateServiceImpl.java | 126 ++++++++++++++++ .../mapper/EnforcementRegistrationMapper.xml | 8 +- .../mapper/EnterpriseComplaintMapper.xml | 12 +- .../mapper/EnterpriseEvaluateMapper.xml | 91 ++++++++++++ 13 files changed, 727 insertions(+), 9 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseEvaluateController.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseEvaluateController.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseEvaluateController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseEvaluateController.java new file mode 100644 index 00000000..a3878875 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseEvaluateController.java @@ -0,0 +1,104 @@ +package com.zdxt.app.controller; + +import com.zdxt.code.domain.EnterpriseEvaluate; +import com.zdxt.code.service.IEnterpriseEvaluateService; +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 java.util.List; + + +/** + * 企业端-执法评价Controller + * + * @author ruoyi + * @date 2024-08-02 + */ +@Controller +@RequestMapping("/app/evaluate") +public class AppEnterpriseEvaluateController extends BaseController +{ + private String prefix = "project/code/evaluate"; + + @Autowired + private IEnterpriseEvaluateService enterpriseEvaluateService; + + @RequiresPermissions("system:evaluate:view") + @GetMapping() + public String evaluate() + { + return prefix + "/evaluate"; + } + + /** + * 查询企业端-执法评价列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(EnterpriseEvaluate enterpriseEvaluate) + { + startPage(); + List list = enterpriseEvaluateService.selectEnterpriseEvaluateList(enterpriseEvaluate); + return getDataTable(list); + } + + + /** + * 新增企业端-执法评价 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存企业端-执法评价 + */ + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(@RequestBody EnterpriseEvaluate enterpriseEvaluate) + { + return enterpriseEvaluateService.insertEnterpriseEvaluate(enterpriseEvaluate) > 0 + ?ZDResponse.success("保存成功"):ZDResponse.error("保存失败"); + } + + /** + * 修改企业端-执法评价 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + EnterpriseEvaluate enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateById(id); + mmap.put("enterpriseEvaluate", enterpriseEvaluate); + return prefix + "/edit"; + } + + /** + * 修改保存企业端-执法评价 + */ + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(EnterpriseEvaluate enterpriseEvaluate) + { + return enterpriseEvaluateService.updateEnterpriseEvaluate(enterpriseEvaluate) > 0 ? + ZDResponse.success("修改成功"):ZDResponse.error("修改失败"); + } + + /** + * 删除企业端-执法评价 + */ + @PostMapping( "/remove") + @ResponseBody + public ZDResponse remove(String ids) + { + return enterpriseEvaluateService.deleteEnterpriseEvaluateByIds(ids) > 0 ? + ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseEvaluateController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseEvaluateController.java new file mode 100644 index 00000000..afc66e7f --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseEvaluateController.java @@ -0,0 +1,108 @@ +package com.zdxt.code.controller; + +import java.util.List; + +import com.zdxt.code.domain.EnterpriseEvaluate; +import com.zdxt.code.service.IEnterpriseEvaluateService; +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.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; + + +/** + * 企业端-执法评价Controller + * + * @author ruoyi + * @date 2024-08-02 + */ +@Controller +@RequestMapping("/code/evaluate") +public class EnterpriseEvaluateController extends BaseController +{ + private String prefix = "system/evaluate"; + + @Autowired + private IEnterpriseEvaluateService enterpriseEvaluateService; + + @RequiresPermissions("system:evaluate:view") + @GetMapping() + public String evaluate() + { + return prefix + "/evaluate"; + } + + /** + * 查询企业端-执法评价列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(EnterpriseEvaluate enterpriseEvaluate) + { + startPage(); + List list = enterpriseEvaluateService.selectEnterpriseEvaluateList(enterpriseEvaluate); + return getDataTable(list); + } + + + /** + * 新增企业端-执法评价 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存企业端-执法评价 + */ + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(EnterpriseEvaluate enterpriseEvaluate) + { + return enterpriseEvaluateService.insertEnterpriseEvaluate(enterpriseEvaluate) > 0 + ?ZDResponse.success("保存成功"):ZDResponse.error("保存失败"); + } + + /** + * 修改企业端-执法评价 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + EnterpriseEvaluate enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateById(id); + mmap.put("enterpriseEvaluate", enterpriseEvaluate); + return prefix + "/edit"; + } + + /** + * 修改保存企业端-执法评价 + */ + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(EnterpriseEvaluate enterpriseEvaluate) + { + return enterpriseEvaluateService.updateEnterpriseEvaluate(enterpriseEvaluate) > 0 ? + ZDResponse.success("修改成功"):ZDResponse.error("修改失败"); + } + + /** + * 删除企业端-执法评价 + */ + @PostMapping( "/remove") + @ResponseBody + public ZDResponse remove(String ids) + { + return enterpriseEvaluateService.deleteEnterpriseEvaluateByIds(ids) > 0 ? + ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); + } +} 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 05733def..cc5f5148 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 @@ -32,7 +32,7 @@ public class EnforcementInspectionProgram extends BaseDomain private String enforcementDepartmentId; /** 执法时间 */ - private Date enforcementTime; + private String enforcementTime; /** 执法区域 */ private String enforcementArea; @@ -170,12 +170,12 @@ public class EnforcementInspectionProgram extends BaseDomain { return enforcementDepartmentId; } - public void setEnforcementTime(Date enforcementTime) + public void setEnforcementTime(String enforcementTime) { this.enforcementTime = enforcementTime; } - public Date getEnforcementTime() + public String getEnforcementTime() { return enforcementTime; } 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 3d5737da..1f7d758e 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 @@ -102,6 +102,10 @@ public class EnforcementRegistration extends BaseDomain */ private Integer isSubmit; + /** + * 是否评价 0 否 1 是 + */ + private Integer isEvaluate; /** * 局级部门ID @@ -572,4 +576,12 @@ public class EnforcementRegistration extends BaseDomain public void setBureauDeptName(String bureauDeptName) { this.bureauDeptName = bureauDeptName; } + + public Integer getIsEvaluate() { + return isEvaluate; + } + + public void setIsEvaluate(Integer isEvaluate) { + this.isEvaluate = isEvaluate; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java new file mode 100644 index 00000000..2f58961c --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java @@ -0,0 +1,138 @@ +package com.zdxt.code.domain; + +import com.zdxt.common.BaseDomain; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +/** + * 企业端-执法评价对象 enterprise_evaluate + * + * @author ruoyi + * @date 2024-08-02 + */ +public class EnterpriseEvaluate extends BaseDomain +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 案件名称 */ + private String enforcementName; + + /** 案件ID */ + private String enforcementId; + + /** 评价｜意见建议 */ + private String evaluateDescription; + + /** 联系人 */ + private String linkman; + + /** 联系电话 */ + private String linkmanTel; + + /** 是否授权 0 否 1是 */ + private Integer authorization; + + /** 企业名称 */ + private String enterpriseName; + + /** 企业纳税识别号 */ + private String enterpriseNumber; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setEnforcementName(String enforcementName) + { + this.enforcementName = enforcementName; + } + + public String getEnforcementName() + { + return enforcementName; + } + public void setEnforcementId(String enforcementId) + { + this.enforcementId = enforcementId; + } + + public String getEnforcementId() + { + return enforcementId; + } + public void setEvaluateDescription(String evaluateDescription) + { + this.evaluateDescription = evaluateDescription; + } + + public String getEvaluateDescription() + { + return evaluateDescription; + } + public void setLinkman(String linkman) + { + this.linkman = linkman; + } + + public String getLinkman() + { + return linkman; + } + public void setLinkmanTel(String linkmanTel) + { + this.linkmanTel = linkmanTel; + } + + public String getLinkmanTel() + { + return linkmanTel; + } + public void setAuthorization(Integer authorization) + { + this.authorization = authorization; + } + + public Integer getAuthorization() + { + return authorization; + } + + public String getEnterpriseName() { + return enterpriseName; + } + + public void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; + } + + public String getEnterpriseNumber() { + return enterpriseNumber; + } + + public void setEnterpriseNumber(String enterpriseNumber) { + this.enterpriseNumber = enterpriseNumber; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("enforcementName", getEnforcementName()) + .append("enforcementId", getEnforcementId()) + .append("evaluateDescription", getEvaluateDescription()) + .append("linkman", getLinkman()) + .append("linkmanTel", getLinkmanTel()) + .append("authorization", getAuthorization()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java new file mode 100644 index 00000000..3e3fe621 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseEvaluateMapper.java @@ -0,0 +1,62 @@ +package com.zdxt.code.mapper; + +import com.zdxt.code.domain.EnterpriseEvaluate; + +import java.util.List; + +/** + * 企业端-执法评价Mapper接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface EnterpriseEvaluateMapper +{ + /** + * 查询企业端-执法评价 + * + * @param id 企业端-执法评价ID + * @return 企业端-执法评价 + */ + public EnterpriseEvaluate selectEnterpriseEvaluateById(String id); + + /** + * 查询企业端-执法评价列表 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 企业端-执法评价集合 + */ + public List selectEnterpriseEvaluateList(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 新增企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + public int insertEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 修改企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + public int updateEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 删除企业端-执法评价 + * + * @param id 企业端-执法评价ID + * @return 结果 + */ + public int deleteEnterpriseEvaluateById(String id); + + /** + * 批量删除企业端-执法评价 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteEnterpriseEvaluateByIds(String[] ids); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java new file mode 100644 index 00000000..2e043578 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseEvaluateService.java @@ -0,0 +1,62 @@ +package com.zdxt.code.service; + +import com.zdxt.code.domain.EnterpriseEvaluate; + +import java.util.List; + +/** + * 企业端-执法评价Service接口 + * + * @author ruoyi + * @date 2024-08-02 + */ +public interface IEnterpriseEvaluateService +{ + /** + * 查询企业端-执法评价 + * + * @param id 企业端-执法评价ID + * @return 企业端-执法评价 + */ + public EnterpriseEvaluate selectEnterpriseEvaluateById(String id); + + /** + * 查询企业端-执法评价列表 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 企业端-执法评价集合 + */ + public List selectEnterpriseEvaluateList(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 新增企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + public int insertEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 修改企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + public int updateEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate); + + /** + * 批量删除企业端-执法评价 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteEnterpriseEvaluateByIds(String ids); + + /** + * 删除企业端-执法评价信息 + * + * @param id 企业端-执法评价ID + * @return 结果 + */ + public int deleteEnterpriseEvaluateById(String id); +} 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 f272d1d8..a911e187 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 @@ -152,6 +152,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistration.setCreateTime(DateUtils.getNowDate()); enforcementRegistration.setUserId(user.getUserId()); enforcementRegistration.setDeptId(user.getDeptId()); + //默认评价状态为 0 否 + enforcementRegistration.setIsEvaluate(0); //默认为登记状态 // enforcementRegistration.setStatus(0); resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); 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 492e3939..ed2c8863 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 @@ -90,7 +90,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi enterpriseComplaint.setCreateTime(DateUtils.getNowDate()); enterpriseComplaint.setId(IdUtil.simpleUUID()); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); - if (i > 0) { + /*if (i > 0) { try { // 新增民生诉求工单 MssqAddOrder mssqAddOrder = new MssqAddOrder(); @@ -124,7 +124,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(); @@ -138,7 +138,6 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi zdxtFileCommonApi.addZdxtFileCommon(zdxtFileCommon); }); - } if(i > 0){ //修改执法记录状态为已投诉 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java new file mode 100644 index 00000000..c456812e --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseEvaluateServiceImpl.java @@ -0,0 +1,126 @@ +package com.zdxt.code.service.impl; + +import java.util.List; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.EnterpriseEvaluate; +import com.zdxt.code.mapper.EnforcementRegistrationMapper; +import com.zdxt.code.mapper.EnterpriseEvaluateMapper; +import com.zdxt.code.service.IEnterpriseEvaluateService; +import com.zdxt.common.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 企业端-执法评价Service业务层处理 + * + * @author ruoyi + * @date 2024-08-02 + */ +@Service +public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService +{ + @Autowired + private EnterpriseEvaluateMapper enterpriseEvaluateMapper; + + @Autowired + private EnforcementRegistrationMapper enforcementRegistrationMapper; + + /** + * 查询企业端-执法评价 + * + * @param id 企业端-执法评价ID + * @return 企业端-执法评价 + */ + @Override + public EnterpriseEvaluate selectEnterpriseEvaluateById(String id) + { + return enterpriseEvaluateMapper.selectEnterpriseEvaluateById(id); + } + + /** + * 查询企业端-执法评价列表 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 企业端-执法评价 + */ + @Override + public List selectEnterpriseEvaluateList(EnterpriseEvaluate enterpriseEvaluate) + { + return enterpriseEvaluateMapper.selectEnterpriseEvaluateList(enterpriseEvaluate); + } + + /** + * 新增企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + @Override + public int insertEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) + { + enterpriseEvaluate.setCreateTime(DateUtils.getNowDate()); + enterpriseEvaluate.setId(IdUtil.simpleUUID()); + + //查询案件信息 + EnforcementRegistration enforcementRegistration = + enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseEvaluate.getEnforcementId()); + if(StrUtil.isNotEmpty(enforcementRegistration.getEnterpriseNumber())){ + //获取被执法企业信息 + enterpriseEvaluate.setEnterpriseName(enforcementRegistration.getEnterpriseName()); + enterpriseEvaluate.setEnterpriseNumber(enforcementRegistration.getEnterpriseNumber()); + } + int i = enterpriseEvaluateMapper.insertEnterpriseEvaluate(enterpriseEvaluate); + if(i > 0){ + //变更执法登记是否评价状态 + EnforcementRegistration enforcementRegistration1 = new EnforcementRegistration(); + enforcementRegistration1.setId(enforcementRegistration.getId()); + enforcementRegistration1.setIsEvaluate(1); + + + enforcementRegistrationMapper.updateEnforcementRegistration(enforcementRegistration1); + } + return i; + } + + /** + * 修改企业端-执法评价 + * + * @param enterpriseEvaluate 企业端-执法评价 + * @return 结果 + */ + @Override + public int updateEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) + { + enterpriseEvaluate.setUpdateTime(DateUtils.getNowDate()); + return enterpriseEvaluateMapper.updateEnterpriseEvaluate(enterpriseEvaluate); + } + + /** + * 删除企业端-执法评价对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteEnterpriseEvaluateByIds(String ids) + { + return enterpriseEvaluateMapper.deleteEnterpriseEvaluateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除企业端-执法评价信息 + * + * @param id 企业端-执法评价ID + * @return 结果 + */ + @Override + public int deleteEnterpriseEvaluateById(String id) + { + return enterpriseEvaluateMapper.deleteEnterpriseEvaluateById(id); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 6cbbd9c6..ccacccde 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -59,8 +60,8 @@ 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 - from enforcement_registration + bureau_dept_id,bureau_dept_name,is_evaluate + from enforcement_registration @@ -30,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and problem_description = #{problemDescription} and linkman = #{linkman} and linkman_tel = #{linkmanTel} + and enterprise_number = #{enterpriseNumber} ORDER BY create_time DESC @@ -53,6 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" authorization, create_time, pro_wo_code, + enterprise_name, + enterprise_number, #{id}, @@ -66,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{authorization}, #{createTime}, #{proWoCode}, + #{enterpriseName}, + #{enterpriseNumber}, diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml new file mode 100644 index 00000000..07a0b5d9 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + select id, enforcement_name, enforcement_id, evaluate_description, linkman, linkman_tel, + authorization, create_time,enterprise_number,enterprise_name from enterprise_evaluate + + + + + + + + insert into enterprise_evaluate + + id, + enforcement_name, + enforcement_id, + evaluate_description, + linkman, + linkman_tel, + authorization, + create_time, + + + #{id}, + #{enforcementName}, + #{enforcementId}, + #{evaluateDescription}, + #{linkman}, + #{linkmanTel}, + #{authorization}, + #{createTime}, + + + + + update enterprise_evaluate + + enforcement_name = #{enforcementName}, + enforcement_id = #{enforcementId}, + evaluate_description = #{evaluateDescription}, + linkman = #{linkman}, + linkman_tel = #{linkmanTel}, + authorization = #{authorization}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from enterprise_evaluate where id = #{id} + + + + delete from enterprise_evaluate where id in + + #{id} + + + + \ No newline at end of file