建阳问题-供应商审核之前改的sql不可以用恢复原来的

dev_drug_dm
qiuyt 3 weeks ago
parent f33064a0f9
commit 97a07669ea

@ -42,7 +42,7 @@ import java.util.Objects;
public class YbNotCodeController { public class YbNotCodeController {
@Resource @Resource
YbNotCodeServiceImpl ybNotCodeService; YbNotCodeServiceImpl ybNotCodeService;
@PostMapping("/udispms/ybNotCode/page") @PostMapping("/udi/ybNotCode/page")
public BaseResponse page(@RequestBody YbNotCodeQuery query) { public BaseResponse page(@RequestBody YbNotCodeQuery query) {
List<YbNotCode> list = ybNotCodeService.pageList(query); List<YbNotCode> list = ybNotCodeService.pageList(query);
PageInfo pageInfo = new PageInfo<>(list); PageInfo pageInfo = new PageInfo<>(list);
@ -52,19 +52,19 @@ public class YbNotCodeController {
return ResultVOUtils.success(page); return ResultVOUtils.success(page);
} }
@PostMapping("/udispms/ybNotCode/add") @PostMapping("/udi/ybNotCode/add")
public BaseResponse add(@RequestBody YbNotCode ybNotCode) { public BaseResponse add(@RequestBody YbNotCode ybNotCode) {
return ResultVOUtils.success(ybNotCodeService.add(ybNotCode)); return ResultVOUtils.success(ybNotCodeService.add(ybNotCode));
} }
@PostMapping("/udispms/ybNotCode/update") @PostMapping("/udi/ybNotCode/update")
public BaseResponse update(@RequestBody YbNotCode ybNotCode) { public BaseResponse update(@RequestBody YbNotCode ybNotCode) {
return ResultVOUtils.success(ybNotCodeService.update(ybNotCode)); return ResultVOUtils.success(ybNotCodeService.update(ybNotCode));
} }
@PostMapping("/udispms/ybNotCode/delete") @PostMapping("/udi/ybNotCode/delete")
public BaseResponse delete(@RequestBody YbNotCode ybNotCode) { public BaseResponse delete(@RequestBody YbNotCode ybNotCode) {
return ResultVOUtils.success(ybNotCodeService.delete(ybNotCode)); return ResultVOUtils.success(ybNotCodeService.delete(ybNotCode));
} }
@GetMapping("/udispms/ybNotCode/export") @GetMapping("/udi/ybNotCode/export")
public void export( YbNotCodeQuery query,HttpServletResponse response) throws IOException { public void export( YbNotCodeQuery query,HttpServletResponse response) throws IOException {
List<YbNotCode> list; List<YbNotCode> list;
if(query.getExcelType() !=null && query.getExcelType() == 1 if(query.getExcelType() !=null && query.getExcelType() == 1

@ -15,45 +15,48 @@
<select id="filterCompany" parameterType="com.glxp.api.req.purchase.FilterSupCompanyRequest" <select id="filterCompany" parameterType="com.glxp.api.req.purchase.FilterSupCompanyRequest"
resultType="com.glxp.api.entity.purchase.SupCompanyEntity"> resultType="com.glxp.api.entity.purchase.SupCompanyEntity">
SELECT SELECT
sc.*, *,
COUNT(CASE WHEN c.type = 1 AND c.auditStatus != 0 THEN 1 END) AS supCertCount, (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus != 0 ) as 'supCertCount',
COUNT(CASE WHEN c.type = 1 AND c.auditStatus = 1 THEN 1 END) AS supCertOkCount, (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus = 1 ) as 'supCertOkCount',
COUNT(CASE WHEN c.type = 1 AND c.auditStatus = 6 THEN 1 END) AS supCertNotCount, (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus = 6 ) as 'supCertNotCount'
<if test="manufacturerStatus != null"> <if test="manufacturerStatus!=null">
COALESCE(SUM(CASE WHEN sm.auditStatus NOT IN (0, 1, 4) THEN 1 END), 0) AS failCout, ,(SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND sup_manufacturer.auditStatus!=1 AND sup_manufacturer.auditStatus!=0 AND sup_manufacturer.auditStatus!=4 ) as failCout,
COALESCE(SUM(CASE WHEN sm.auditStatus IN (1, 4) THEN 1 END), 0) AS passCout, (SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND (sup_manufacturer.auditStatus=1 OR sup_manufacturer.auditStatus=4) ) as passCout
COALESCE(SUM(CASE WHEN sp.auditStatus NOT IN (0, 1, 4) THEN 1 END), 0) AS productFailCout, ,(SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 ) as productFailCout,
COALESCE(SUM(CASE WHEN sp.auditStatus IN (1, 4) THEN 1 END), 0) AS productPassCout (SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) ) as prouctPassCout
</if> </if>
FROM sup_company sc FROM sup_company
LEFT JOIN sup_cert c ON sc.customerId = c.customerId
<where> <where>
<if test="customerId != null and customerId != ''"> <if test="customerId != null and customerId != ''">
and sc.customerId = #{customerId} and customerId = #{customerId}
</if> </if>
<if test="companyName != null and companyName != ''"> <if test="companyName != null and companyName != ''">
and sc.companyName like concat('%',#{companyName},'%') and companyName like concat('%',#{companyName},'%')
</if> </if>
<if test="creditNum != null and creditNum != ''"> <if test="creditNum != null and creditNum != ''">
and sc.creditNum like concat('%',#{creditNum},'%') and creditNum like concat('%',#{creditNum},'%')
</if> </if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22"> <if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
and sc.auditStatus = #{auditStatus} and auditStatus = #{auditStatus}
</if> </if>
<if test="auditStatus ==20"> <if test="auditStatus ==20">
and (sc.auditStatus = 0 or sc.auditStatus=5 or sc.auditStatus=2) and (auditStatus = 0 or auditStatus=5 or auditStatus=2)
</if> </if>
<if test="auditStatus ==21"> <if test="auditStatus ==21">
and <![CDATA[ sc.auditStatus <> 0 ]]> and <![CDATA[ auditStatus <> 0 ]]>
</if> </if>
<if test="auditStatus ==22"> <if test="auditStatus ==22">
and (sc.auditStatus = 1 or sc.auditStatus=4 ) and (auditStatus = 1 or auditStatus=4 )
</if> </if>
<if test="unitIdFk != null and unitIdFk != ''"> <if test="unitIdFk != null and unitIdFk != ''">
and sc.unitIdFk = #{unitIdFk} and unitIdFk = #{unitIdFk}
</if> </if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''"> <if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(sc.updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if> </if>
</where> </where>
</select> </select>

Loading…
Cancel
Save