资产核查查询条件新增

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -9,18 +9,57 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.tc.entity.*;
+import com.ruoyi.tc.entity.AssetBasicNetwork;
-import com.ruoyi.tc.entity.po.*;
+import com.ruoyi.tc.entity.AssetBusinessForm;
+import com.ruoyi.tc.entity.AssetCurrent;
+import com.ruoyi.tc.entity.AssetExport;
+import com.ruoyi.tc.entity.AssetSupplyChain;
+import com.ruoyi.tc.entity.Unit;
+import com.ruoyi.tc.entity.UnitOtherConcat;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo;
+import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
+import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
+import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
+import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
+import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
+import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
+import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
 import com.ruoyi.tc.entity.request.Acomma;
 import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
 import com.ruoyi.tc.entity.request.AssetAuditRequest;
 import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
-import com.ruoyi.tc.service.*;
+import com.ruoyi.tc.service.AssetBasicNetworkCpService;
+import com.ruoyi.tc.service.AssetBasicNetworkJyService;
+import com.ruoyi.tc.service.AssetBasicNetworkService;
+import com.ruoyi.tc.service.AssetBusinessFormCpService;
+import com.ruoyi.tc.service.AssetBusinessFormJyService;
+import com.ruoyi.tc.service.AssetBusinessFormService;
+import com.ruoyi.tc.service.AssetCurrentCpService;
+import com.ruoyi.tc.service.AssetCurrentJyService;
+import com.ruoyi.tc.service.AssetCurrentService;
+import com.ruoyi.tc.service.AssetSupplyChainCpService;
+import com.ruoyi.tc.service.AssetSupplyChainJyService;
+import com.ruoyi.tc.service.AssetSupplyChainService;
+import com.ruoyi.tc.service.AssetTaskService;
+import com.ruoyi.tc.service.UnitOtherConcatCpService;
+import com.ruoyi.tc.service.UnitOtherConcatJyservice;
+import com.ruoyi.tc.service.UnitOtherConcatService;
+import com.ruoyi.tc.service.UnitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -573,7 +612,7 @@ public class AssetCurrentController extends BaseController {
             queryWrapper1.eq("task_id", i);
             queryWrapper1.ne("status", 5);
             AssetCurrentCpPo x = assetCurrentCpService.getOne(queryWrapper1);
-
+            if (BeanUtil.isEmpty(x)) {
                 Integer status = x.getStatus();
                 Long currentId = x.getCurrentId();
                 AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
@@ -582,7 +621,6 @@ public class AssetCurrentController extends BaseController {
                 assetCurrentCpPo.setCurrentId(currentId);
                 assetCurrentCpPo.setStatus(status);
                 assetCurrentCpService.updateById(assetCurrentCpPo);
-
                 QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>();
                 queryWrapper2.eq("asset_id", assetCurrent.getId());
                 queryWrapper2.eq("task_id", i);
@@ -630,6 +668,7 @@ public class AssetCurrentController extends BaseController {
                     unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
                 }
             }
+        }
         return success();
     }
 

ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml

@@ -233,6 +233,9 @@
             <if test="req.xtlx!=null and req.xtlx!='' ">
                 and b.xtlx = #{req.xtlx}
             </if>
+            <if test="req.xtmc!=null and req.xtmc!='' ">
+                and b.xtmc = #{req.xtmc}
+            </if>
         </where>
         order by FIELD(status,1,0,3,4,5)
     </select>
@@ -466,6 +469,9 @@
             <if test="req.status!=null  ">
                 and b.status =#{req.status}
             </if>
+            <if test="req.xtmc!=null and req.xtmc!='' ">
+                and b.xcxmc = #{req.xtmc}
+            </if>
 
         </where>
         ORDER BY
@@ -500,6 +506,9 @@
             <if test="req.status!=null  ">
                 and b.status =#{req.status}
             </if>
+            <if test="req.xtmc!=null and req.xtmc!='' ">
+                and b.gzhmc = #{req.xtmc}
+            </if>
         </where>
         ORDER BY
         CASE
@@ -533,6 +542,9 @@
             <if test="req.status!=null  ">
                 and b.status =#{req.status}
             </if>
+            <if test="req.xtmc!=null and req.xtmc!='' ">
+                and b.dzyxhz = #{req.xtmc}
+            </if>
         </where>
         ORDER BY
         CASE
@@ -543,8 +555,6 @@
         b.STATUS ASC
     </select>
     <select id="appZcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
-
-
         select
         b.app_name as xtmc,
         b.ssdw as zcdwmc,
@@ -568,6 +578,9 @@
             <if test="req.status!=null  ">
                 and b.status =#{req.status}
             </if>
+            <if test="req.xtmc!=null and req.xtmc!='' ">
+                and b.app_name = #{req.xtmc}
+            </if>
         </where>
         ORDER BY
         CASE