个人分类审批修改

huimv-receive/src/main/java/com/huimv/receive/ReceiveApplication.java

@@ -40,10 +40,10 @@ public class ReceiveApplication {
         Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
         connector.setScheme("http");
         //Connector监听的http的默认端口号
-        connector.setPort(8016);
+        connector.setPort(8014);
         connector.setSecure(false);
         //监听到http的端口号后转向到的https的端口号,也就是项目配置的port
-        connector.setRedirectPort(8017);
+        connector.setRedirectPort(8015);
         return connector;
     }
 }

huimv-receive/src/main/java/com/huimv/receive/config/ApiPrefixAutoConfiguration.java

@@ -10,7 +10,7 @@ public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
 
     @Override
     public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("/securesApi",  c -> c.isAnnotationPresent(RestController.class));
+        configurer.addPathPrefix("/secureApi",  c -> c.isAnnotationPresent(RestController.class));
     }
 
 }

huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -22,55 +22,55 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/securesApi/admin/my/*","/securesApi/bill-access-door/getDoorData","/securesApi/bill-gate/getGateData")
-                .excludePathPatterns("/securesApi/receive/feed","/securesApi/bill-personnel-admission/printAdmission"
-                        ,"/securesApi/bill-personnel-admission/printAdmission"
-                        ,"/securesApi/bill-pcr/printPcr"
-                        ,"/securesApi/bill-clean/printClean"
-                        ,"/securesApi/bill-isolate/printIsolate"
-                        ,"/securesApi/bill-luggage/printLuggage"
-                        ,"/securesApi/admin/user/printUser"
-                        ,"/securesApi/admin/accountMultilevel/printAccount"
-                        ,"/securesApi/base-device/printDevice"
-                        ,"/securesApi/bill-personnel-admission/listDoor"
+                excludePathPatterns("/secureApi/admin/my/*","/secureApi/bill-access-door/getDoorData","/secureApi/bill-gate/getGateData")
+                .excludePathPatterns("/secureApi/receive/feed","/secureApi/bill-personnel-admission/printAdmission"
+                        ,"/secureApi/bill-personnel-admission/printAdmission"
+                        ,"/secureApi/bill-pcr/printPcr"
+                        ,"/secureApi/bill-clean/printClean"
+                        ,"/secureApi/bill-isolate/printIsolate"
+                        ,"/secureApi/bill-luggage/printLuggage"
+                        ,"/secureApi/admin/user/printUser"
+                        ,"/secureApi/admin/accountMultilevel/printAccount"
+                        ,"/secureApi/base-device/printDevice"
+                        ,"/secureApi/bill-personnel-admission/listDoor"
 
                         //后台统计接口开放
-                        ,"/securesApi/bill-personnel-admission/countAdmission"
-                        ,"/securesApi/bill-personnel-admission/listTop"
-                        ,"/securesApi/bill-personnel-admission/admissionTail"
-                        ,"/securesApi/bill-personnel-admission/selectList"
-                        ,"/securesApi/bill-personnel-admission/uploadImgAndAdmissin"
-                        ,"/securesApi/bill-personnel-admission/delete"
+                        ,"/secureApi/bill-personnel-admission/countAdmission"
+                        ,"/secureApi/bill-personnel-admission/listTop"
+                        ,"/secureApi/bill-personnel-admission/admissionTail"
+                        ,"/secureApi/bill-personnel-admission/selectList"
+                        ,"/secureApi/bill-personnel-admission/uploadImgAndAdmissin"
+                        ,"/secureApi/bill-personnel-admission/delete"
 
-                        ,"/securesApi/bill-pcr/pcrWhole"
-                        ,"/securesApi/bill-pcr/listType"
-                        ,"/securesApi/bill-pcr/listLocation"
-                        ,"/securesApi/bill-pcr/listAll"
-                        ,"/securesApi/bill-pcr/selectList"
-                        ,"/securesApi/bill-pcr/delete"
+                        ,"/secureApi/bill-pcr/pcrWhole"
+                        ,"/secureApi/bill-pcr/listType"
+                        ,"/secureApi/bill-pcr/listLocation"
+                        ,"/secureApi/bill-pcr/listAll"
+                        ,"/secureApi/bill-pcr/selectList"
+                        ,"/secureApi/bill-pcr/delete"
 
 
-                        ,"/securesApi/bill-clean/listCount"
-                        ,"/securesApi/bill-clean/allList"
-                        ,"/securesApi/bill-clean/CleanSelect"
-                        ,"/securesApi/bill-clean/delete"
-                        ,"/securesApi/bill-clean/listScreen"
+                        ,"/secureApi/bill-clean/listCount"
+                        ,"/secureApi/bill-clean/allList"
+                        ,"/secureApi/bill-clean/CleanSelect"
+                        ,"/secureApi/bill-clean/delete"
+                        ,"/secureApi/bill-clean/listScreen"
 
 
-                        ,"/securesApi/bill-isolate/isolateList"
-                        ,"/securesApi/bill-isolate/isolateSelect"
-                        ,"/securesApi/bill-isolate/delete"
+                        ,"/secureApi/bill-isolate/isolateList"
+                        ,"/secureApi/bill-isolate/isolateSelect"
+                        ,"/secureApi/bill-isolate/delete"
 
-                        ,"/securesApi/bill-luggage/listLuggage"
-                        ,"/securesApi/bill-luggage/selectLuggage"
-                        ,"/securesApi/bill-luggage/delete"
+                        ,"/secureApi/bill-luggage/listLuggage"
+                        ,"/secureApi/bill-luggage/selectLuggage"
+                        ,"/secureApi/bill-luggage/delete"
 
 
 
 
-                        ,"/securesApi/bill-personnel-admission/jingJiAdmission"
-                        ,"/securesApi/bill-personnel-admission/allCount"
-                        ,"/securesApi/bill-pcr/pcrList"
-                        ,"/securesApi/bill-goods-inventory/listAll");
+                        ,"/secureApi/bill-personnel-admission/jingJiAdmission"
+                        ,"/secureApi/bill-personnel-admission/allCount"
+                        ,"/secureApi/bill-pcr/pcrList"
+                        ,"/secureApi/bill-goods-inventory/listAll");
     }
 }

huimv-receive/src/main/java/com/huimv/receive/mapper/BillCleanMapper.java

@@ -36,4 +36,6 @@ public interface BillCleanMapper extends BaseMapper<BillClean> {
     List<CleanVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<BillClean> queryWrapper);
 
     Page<CleanDryGoodsVo> listCleanDryGoods(Page<CleanDryGoodsVo> page, String farmId, String type, String[] status, String[] locations);
+
+    Page<CleanDryGoodsVo> listCleanDryGoods2(Page<CleanDryGoodsVo> page, String farmId, String type, String[] status, String[] locations);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -204,7 +204,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         QueryWrapper<BillGoodsInventory> queryWrapper3 = new QueryWrapper<>();
         queryWrapper3.eq("farm_id", farmId);
 
-        String[] s = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
+        String[] s = {TokenSign.getMemberIdByJwtToken(httpServletRequest).toString()};
         System.out.println("传入自定义sql的位置参数形式：" + s);
         cleanDryGoodPage = cleanMapper.listCleanDryGoods(page, farmId, "5", "0,1".split(","), s);
 //        queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest));

huimv-receive/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8017
+  port: 8015
   ssl:
     key-store: classpath:12743383_receive.ifarmcloud.com.jks
     key-store-type: jks

huimv-receive/src/main/resources/com/huimv/receive/mapper/BillCleanMapper.xml

@@ -122,30 +122,63 @@ ORDER BY
     </select>
     <select id="listCleanDryGoods" resultType="com.huimv.receive.entity.vo.CleanDryGoodsVo">
         select id,vistit_Type,test_location,admission_user_name,car_num,clean_time,null as 'dryTime',check_date,sub_date,bill_status,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
-<!--        and test_location_id in-->
-<!--        <foreach collection="locations" item="location" separator="," open="(" close=")">-->
-<!--            #{location}-->
-<!--        </foreach>-->
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
         and img_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
         union all
         select id,vistit_Type,test_location,admission_user_name,car_num,null as 'cleanTime',dry_time,check_date,sub_date,bill_status,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
-<!--        and test_location_id in-->
-<!--        <foreach collection="locations" item="location" separator="," open="(" close=")">-->
-<!--            #{location}-->
-<!--        </foreach>-->
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
         and img_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
         union all
         select id,'5' as 'vistitType',test_location as 'testLocation',admission_user_name,car_num,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,sub_date,bill_status as 'billStatus' ,null,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
-<!--        and current_location_id in-->
-<!--        <foreach collection="locations" item="location" separator="," open="(" close=")">-->
-<!--            #{location}-->
-<!--        </foreach>-->
+        and test_location_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        ORDER BY sub_date DESC
+    </select>
+
+    <select id="listCleanDryGoods2" resultType="com.huimv.receive.entity.vo.CleanDryGoodsVo">
+        select id,vistit_Type,test_location,admission_user_name,car_num,clean_time,null as 'dryTime',check_date,sub_date,bill_status,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
+        and admission_user_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        union all
+        select id,vistit_Type,test_location,admission_user_name,car_num,null as 'cleanTime',dry_time,check_date,sub_date,bill_status,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
+        and admission_user_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
+        union all
+        select id,'5' as 'vistitType',test_location as 'testLocation',admission_user_name,car_num,null as 'cleanTime',null as 'dryTime',null as 'checkDate' ,sub_date,bill_status as 'billStatus' ,null,3 AS 'type' from bill_goods_inventory where farm_id=#{farmId}
+        and admission_user_id in
+        <foreach collection="locations" item="location" separator="," open="(" close=")">
+            #{location}
+        </foreach>
         and bill_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}