suzhou-jichuang-lanhai
/
TcAssetVerificationJava
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: suzhou-jichuang-lanhai:63fde845cf1b360eb25f198bceee09fae346fe4c
Branches Tags
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:main
..
compare: suzhou-jichuang-lanhai:6e908e6b45a22fde0ded5893d9fd1a91e1f4c976
Branches Tags
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:main

No commits in common. '63fde845cf1b360eb25f198bceee09fae346fe4c' and '6e908e6b45a22fde0ded5893d9fd1a91e1f4c976' have entirely different histories.
63fde845cf ... 6e908e6b45

2 changed files with 57 additions and 109 deletions
Show Stats

51
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
Unescape View File

@ -9,57 +9,18 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetBasicNetwork; import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.AssetBusinessForm; import com.ruoyi.tc.entity.po.*;
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.Acomma;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
import com.ruoyi.tc.service.AssetBasicNetworkCpService; import com.ruoyi.tc.service.*;
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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.*;
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 org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -612,7 +573,7 @@ public class AssetCurrentController extends BaseController {
queryWrapper1.eq("task_id", i); queryWrapper1.eq("task_id", i);
queryWrapper1.ne("status", 5); queryWrapper1.ne("status", 5);
AssetCurrentCpPo x = assetCurrentCpService.getOne(queryWrapper1); AssetCurrentCpPo x = assetCurrentCpService.getOne(queryWrapper1);
if (BeanUtil.isEmpty(x)) {
Integer status = x.getStatus(); Integer status = x.getStatus();
Long currentId = x.getCurrentId(); Long currentId = x.getCurrentId();
AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
@ -621,6 +582,7 @@ public class AssetCurrentController extends BaseController {
assetCurrentCpPo.setCurrentId(currentId); assetCurrentCpPo.setCurrentId(currentId);
assetCurrentCpPo.setStatus(status); assetCurrentCpPo.setStatus(status);
assetCurrentCpService.updateById(assetCurrentCpPo); assetCurrentCpService.updateById(assetCurrentCpPo);
QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>(); QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", assetCurrent.getId()); queryWrapper2.eq("asset_id", assetCurrent.getId());
queryWrapper2.eq("task_id", i); queryWrapper2.eq("task_id", i);
@ -668,7 +630,6 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
} }
} }
}
return success(); return success();
} }

17
ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save