diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppXzjcjbxx025711Controller.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppXzjcjbxx025711Controller.java index cb781928..d871326f 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppXzjcjbxx025711Controller.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppXzjcjbxx025711Controller.java @@ -6,12 +6,10 @@ import com.zdxt.code.domain.Xzqzjbxx173774; import com.zdxt.code.service.IXzjcjbxx025711Service; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,35 +32,35 @@ public class AppXzjcjbxx025711Controller extends BaseController /** * 查询【历史检查信息】列表 */ - @GetMapping("/queryList/{enterpriseNumber}") + @PostMapping("/queryList") @ResponseBody - public ZDResponse queryList(@PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List list = xzjcjbxx025711Service.queryByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史检查信息",list); + List list = xzjcjbxx025711Service.queryByEnterpriseNumber(xzjcjboxx); + return getDataTable(list); } /** * 查询【历史强制案件】列表 */ - @GetMapping("/queryQZAJList/{enterpriseNumber}") + @PostMapping("/queryQZAJList") @ResponseBody - public ZDResponse queryQZAJList( @PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryQZAJList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List qzajList = xzjcjbxx025711Service.queryQZAJByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史强制案件信息",qzajList); + List qzajList = xzjcjbxx025711Service.queryQZAJByEnterpriseNumber(xzjcjboxx); + return getDataTable(qzajList); } /** * 查询【历史处罚案件】列表 */ - @GetMapping("/queryCFAJList/{enterpriseNumber}") + @PostMapping("/queryCFAJList") @ResponseBody - public ZDResponse queryCFAJList( @PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryCFAJList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List xzcfajjbxx026705s = xzjcjbxx025711Service.queryCFAJByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史处罚案件信息",xzcfajjbxx026705s); + List xzcfajjbxx026705s = xzjcjbxx025711Service.queryCFAJByEnterpriseNumber(xzjcjboxx); + return getDataTable(xzcfajjbxx026705s); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/Xzjcjbxx025711Controller.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/Xzjcjbxx025711Controller.java index da1f339d..fb102bdf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/Xzjcjbxx025711Controller.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/Xzjcjbxx025711Controller.java @@ -38,36 +38,36 @@ public class Xzjcjbxx025711Controller extends BaseController /** * 查询【历史检查信息】列表 */ - @GetMapping("/queryList/{enterpriseNumber}") + @PostMapping("/queryList") @ResponseBody - public ZDResponse queryList(@PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List list = xzjcjbxx025711Service.queryByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史检查信息",list); + List list = xzjcjbxx025711Service.queryByEnterpriseNumber(xzjcjboxx); + return getDataTable(list); } /** * 查询【历史强制案件】列表 */ - @GetMapping("/queryQZAJList/{enterpriseNumber}") + @PostMapping("/queryQZAJList") @ResponseBody - public ZDResponse queryQZAJList( @PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryQZAJList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List qzajList = xzjcjbxx025711Service.queryQZAJByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史强制案件信息",qzajList); + List qzajList = xzjcjbxx025711Service.queryQZAJByEnterpriseNumber(xzjcjboxx); + return getDataTable(qzajList); } /** * 查询【历史处罚案件】列表 */ - @GetMapping("/queryCFAJList/{enterpriseNumber}") + @PostMapping("/queryCFAJList") @ResponseBody - public ZDResponse queryCFAJList( @PathVariable("enterpriseNumber") String enterpriseNumber) + public TableDataInfo queryCFAJList(Xzjcjbxx025711 xzjcjboxx) { startPage(); - List xzcfajjbxx026705s = xzjcjbxx025711Service.queryCFAJByEnterpriseNumber(enterpriseNumber); - return ZDResponse.success("查询企业历史处罚案件信息",xzcfajjbxx026705s); + List xzcfajjbxx026705s = xzjcjbxx025711Service.queryCFAJByEnterpriseNumber(xzjcjboxx); + return getDataTable(xzcfajjbxx026705s); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzjcjbxx025711.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzjcjbxx025711.java index 8dd6fdcd..6f1306fe 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzjcjbxx025711.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzjcjbxx025711.java @@ -171,7 +171,18 @@ public class Xzjcjbxx025711 extends BaseDomain /** 系统内部UPDATESTATUS */ private Long updatestatus; - public void setId(Long id) + /** 业务传参用 */ + private String enterpriseNumber; + + public String getEnterpriseNumber() { + return enterpriseNumber; + } + + public void setEnterpriseNumber(String enterpriseNumber) { + this.enterpriseNumber = enterpriseNumber; + } + + public void setId(Long id) { this.id = id; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java index b318d82c..b3d61cf2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Xzjcjbxx025711Mapper.java @@ -49,24 +49,24 @@ public interface Xzjcjbxx025711Mapper /** * 查询企业的历史检查信息 - * @param enterpriseNumber + * @param xzjcjboxx * @return */ - public List queryByEnterpriseNumber(String enterpriseNumber); + public List queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx); /** * 查询企业强制执法 - * @param enterpriseNumber + * @param xzjcjboxx * @return */ - public List queryQZAJByEnterpriseNumber(String enterpriseNumber); + public List queryQZAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx); /** * 查询行政处罚案件 - * @param enterpriseNumber + * @param xzjcjboxx * @return */ - public List queryCFAJByEnterpriseNumber(String enterpriseNumber); + public List queryCFAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx); /** * 查询行政处罚案件 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IXzjcjbxx025711Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IXzjcjbxx025711Service.java index afab809a..62764903 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IXzjcjbxx025711Service.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IXzjcjbxx025711Service.java @@ -17,17 +17,17 @@ public interface IXzjcjbxx025711Service /** * 获取企业历史检查信息 - * @param enterpriseNumber + * @param xzjcjboxx * @return */ - public List queryByEnterpriseNumber(String enterpriseNumber); + public List queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx); /** * 获取企业强制检查案件 - * @param enterpriseNumber + * @param xzjcjboxx * @return */ - public List queryQZAJByEnterpriseNumber(String enterpriseNumber); + public List queryQZAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx); - List queryCFAJByEnterpriseNumber(String enterpriseNumber);; + List queryCFAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx);; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Xzjcjbxx025711ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Xzjcjbxx025711ServiceImpl.java index 5b74297e..a8ee49dd 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Xzjcjbxx025711ServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Xzjcjbxx025711ServiceImpl.java @@ -25,18 +25,18 @@ public class Xzjcjbxx025711ServiceImpl implements IXzjcjbxx025711Service private Xzjcjbxx025711Mapper xzjcjbxx025711Mapper; @Override - public List queryByEnterpriseNumber(String enterpriseNumber) { - return xzjcjbxx025711Mapper.queryByEnterpriseNumber(enterpriseNumber); + public List queryByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx) { + return xzjcjbxx025711Mapper.queryByEnterpriseNumber(xzjcjboxx); } @Override - public List queryQZAJByEnterpriseNumber(String enterpriseNumber) { - return xzjcjbxx025711Mapper.queryQZAJByEnterpriseNumber(enterpriseNumber); + public List queryQZAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx) { + return xzjcjbxx025711Mapper.queryQZAJByEnterpriseNumber(xzjcjboxx); } @Override - public List queryCFAJByEnterpriseNumber(String enterpriseNumber) { - return xzjcjbxx025711Mapper.queryCFAJByEnterpriseNumber(enterpriseNumber); + public List queryCFAJByEnterpriseNumber(Xzjcjbxx025711 xzjcjboxx) { + return xzjcjbxx025711Mapper.queryCFAJByEnterpriseNumber(xzjcjboxx); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml index 006f1393..89ca3399 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml @@ -298,12 +298,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where c601000 = #{c601000} - select b.C601002,b.C601005,b.C601015,b.C601011 from XZJCDSRXX016987 a left join xzjcjbxx025711 b on b.c601000 = a.c601000 where a.C601034 = #{enterpriseNumber} order by b.C601005 desc limit 10 - SELECT a.c301002, a.c301001, @@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE c.c301010 = #{enterpriseNumber} - SELECT a.c201000,a.c201003,a.c201002,b.c206011, b.c206013,b.C206010, c.c201016 FROM XZCFAJJBXX026705 a LEFT JOIN xzcfajjdxx778518 b ON a.c201000 = b.c201000 LEFT JOIN XZCFAJDSRXX594019 c on a.c201000 = c.c201000