修改sql以及传参

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/DeliveryController.java

@@ -114,11 +114,11 @@ public class DeliveryController {
         return success(true);
     }
 
-    @GetMapping("/revertKqxx")
+    @PostMapping("/revertKqxx")
     @Operation(summary = "库区退回")
     @PreAuthorize("@ss.hasPermission('coding:cfxx:return')")
-    public CommonResult<Boolean> revertKqxx(@Valid @RequestParam("ids") List<Long> ids) {
-        dwxxService.revertKqxx(ids);
+    public CommonResult<Boolean> revertKqxx(@Valid @RequestBody CaxxUpdateReqVO updateReqVO) {
+        dwxxService.revertKqxx(updateReqVO);
         return success(true);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/CaxxUpdateReqVO.java

@@ -26,4 +26,7 @@ public class CaxxUpdateReqVO {
 
     @Schema(description = "行政区划等级")
     private String areaLevel;
+
+    @Schema(description = "库区ids")
+    private List<Long>  kqIds;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxService.java

@@ -63,7 +63,7 @@ public interface DwxxService {
 
     void revertCaxx(CaxxUpdateReqVO updateReqVO);
 
-    void revertKqxx(List<Long> kqIds);
+    void revertKqxx(CaxxUpdateReqVO updateReqVO);
 
     PageResult<SpareRespVO> getProvinceSelectedPage(SparePageReqVO pageReqVO);
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -505,11 +505,15 @@ public class DwxxServiceImpl implements DwxxService {
 
     @Override
     @Transactional
-    public void revertKqxx(List<Long> kqIds) {
+    public void revertKqxx(CaxxUpdateReqVO updateReqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         if (ObjectUtils.isEmpty(loginUser)) {
             throw exception(ERROR, "不存在用户信息");
         }
+        List<Long> kqIds = updateReqVO.getKqIds();
+        if (ObjectUtil.isEmpty(kqIds)){
+            throw exception(ERROR, "未选择库区");
+        }
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -38,14 +38,14 @@
                     <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
                         and cc.CAZT=#{pageReqVO.cfzt}
                     </if>
-                    <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
-                        and cc.SJCR between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
+                    <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
                     </if>
-                    <if test="(pageReqVO.kqStart == null or pageReqVO.kqStart == '') and pageReqVO.kqEnd != null and pageReqVO.kqEnd != ''">
-                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+                    <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
                     </if>
-                    <if test=" pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd == null or pageReqVO.kqEnd == '') ">
-                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.kqStart}
+                    <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
                     </if>
                 </where>
                 group by cf.BASE_KQXX_ID
@@ -70,15 +70,15 @@
             <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
                 and ck.xzqhdm like #{pageReqVO.areaCode}
             </if>
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd==null or pageReqVO.cfEnd=='')">
-                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.cfStart}
-            </if>
-            <if test="(pageReqVO.cfStart==null or pageReqVO.cfStart=='') and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
+            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+            </if>           
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
                 and cd.DWMC like #{pageReqVO.dwmc}
             </if>
@@ -116,14 +116,14 @@
                     <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
                         and cc.CAZT=#{pageReqVO.cfzt}
                     </if>
-                    <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
-                        and cc.SJCR between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
+                    <if test="pageReqVO.cfStart!=null and cfStart.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
                     </if>
-                    <if test="(pageReqVO.kqStart == null or pageReqVO.kqStart == '') and pageReqVO.kqEnd != null and pageReqVO.kqEnd != ''">
-                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+                    <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
                     </if>
-                    <if test=" pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd == null or pageReqVO.kqEnd == '') ">
-                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.kqStart}
+                    <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
                     </if>
                 </where>
                 group by cc.KQID
@@ -141,14 +141,14 @@
         <where>
             cd.qyxz!='10'
             and cd.DELETED=0
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd==null or pageReqVO.cfEnd=='')">
-                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.cfStart}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
-            <if test="(pageReqVO.cfStart==null or pageReqVO.cfStart=='') and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
             </if>
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
                 and cd.DWMC like #{pageReqVO.dwmc}
@@ -202,14 +202,14 @@
                     <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
                         and cc.CAZT=#{pageReqVO.cfzt}
                     </if>
-                    <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
-                        and cc.SJCR between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
+                    <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
                     </if>
-                    <if test="(pageReqVO.kqStart == null or pageReqVO.kqStart == '') and pageReqVO.kqEnd != null and pageReqVO.kqEnd != ''">
-                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.kqEnd}
+                    <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
                     </if>
-                    <if test=" pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd == null or pageReqVO.kqEnd == '') ">
-                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.kqStart}
+                    <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
                     </if>
                 </where>
                 group by pe.KQ_ID
@@ -245,14 +245,14 @@
         ) t3 on t3.KQ_ID=ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum between #{pageReqVO.kqStart} and #{pageReqVO.kqEnd}
             </if>
-            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd==null or pageReqVO.cfEnd=='')">
-                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.cfStart}
+            <if test="pageReqVO.kqStart!=null and pageReqVO.kqStart!='' and (pageReqVO.kqEnd==null or pageReqVO.kqEnd=='')">
+                and t1.sjcrNum <![CDATA[>=]]>  #{pageReqVO.kqStart}
             </if>
-            <if test="(pageReqVO.cfStart==null or pageReqVO.cfStart=='') and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
-                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            <if test="(pageReqVO.kqStart==null or pageReqVO.kqStart=='') and pageReqVO.kqEnd!=null and pageReqVO.kqEnd!=''">
+                and t1.sjcrNum <![CDATA[<=]]>  #{pageReqVO.kqEnd}
             </if>
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
                 and cd.DWMC like #{pageReqVO.dwmc}