cpck sxm 2022-4-1

src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java

@@ -46,9 +46,9 @@ public class CRollinfoController {
      * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity]
      **/
     @RequestMapping("/list")
-    public R list(@RequestBody List<QueryList> cRollinfoVo) {
-        List<CRollinfoVo> list = cRollinfoService.getCRollinfoList(cRollinfoVo);
-        return R.ok().put("list", list);
+    public R list(@RequestBody CRollinfoVo cRollinfoVo) {
+        PageUtils page  = cRollinfoService.getCRollinfoList(cRollinfoVo);
+        return R.ok().put("page", page);
     }
 
 
@@ -164,7 +164,6 @@ public class CRollinfoController {
     public R rollPrint(@RequestBody List<CRollinfoEntity> rollno, HttpServletRequest request) {
         cRollinfoService.rollPrint(rollno, request);
         return R.ok("卷标签打印成功");
-
     }
 
 

src/main/java/com/gaotao/modules/finishedProduct/dao/CRollinfoDao.java

@@ -1,9 +1,12 @@
 package com.gaotao.modules.finishedProduct.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gaotao.modules.finishedProduct.entity.RollLabelPrint;
 import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
+import com.gaotao.modules.language.entity.vo.SysLanguagePackVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -29,7 +32,7 @@ public interface CRollinfoDao extends BaseMapper<CRollinfoEntity> {
      * @Param [rollinfoEntity]
      * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity]
      **/
-    List<CRollinfoVo> getCRollinfoList(CRollinfoVo cRollinfoVo);
+    IPage<CRollinfoVo> getCRollinfoList(Page<CRollinfoVo> page,@Param("query") CRollinfoVo cRollinfoVo);
 
     /*
      * @Author sxm

src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java

@@ -31,7 +31,7 @@ public interface CRollinfoService extends IService<CRollinfoEntity> {
      * @Param [rollinfoEntity]
      * @return [com.gaotao.modules.finishedProduct.entity.CRollinfoEntity]
      **/
-    List<CRollinfoVo> getCRollinfoList(List<QueryList> queryLists);
+    PageUtils getCRollinfoList(CRollinfoVo cRollinfoVo);
 
     /*
      * @Author sxm

src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java

@@ -1,7 +1,9 @@
 package com.gaotao.modules.finishedProduct.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.common.exception.RRException;
 import com.gaotao.common.utils.*;
 import com.gaotao.modules.finishedProduct.dao.*;
@@ -12,6 +14,7 @@ import com.gaotao.modules.finishedProduct.vo.CRollInfoStorageVo;
 import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
 import com.gaotao.modules.finishedProduct.vo.PackingVo;
 import com.gaotao.modules.finishedProduct.vo.ReportFileVo;
+import com.gaotao.modules.language.entity.vo.SysLanguagePackVo;
 import com.gaotao.modules.pda.config.XuJieConfig;
 import com.gaotao.modules.pda.utils.HttpClientUtil;
 import com.gaotao.modules.pda.utils.ResponseData;
@@ -109,176 +112,10 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
 
 
     @Override
-    public List<CRollinfoVo> getCRollinfoList(List<QueryList> queryLists) {
-        CRollinfoVo cRollinfoVo = new CRollinfoVo();
-        // 查询条件拼接
-        for (QueryList queryList : queryLists) {
-            switch (queryList.getQueryAttributes()) {
-                case "rollno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRollno(queryList.getQueryValue().toString());
-                    break;
-                case "site":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSite(queryList.getQueryValue().toString());
-                    break;
-                case "partDescription":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setPartDescription(queryList.getQueryValue().toString());
-                    break;
-                case "rollqty":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRollqty(Double.valueOf(queryList.getQueryValue().toString()));
-                    break;
-                case "partno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setPartno(queryList.getQueryValue().toString());
-                    break;
-                case "supplierid":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSupplierid(queryList.getQueryValue().toString());
-                    break;
-                case "orderref1":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOrderref1(queryList.getQueryValue().toString());
-                    break;
-                case "orderref2":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOrderref2(queryList.getQueryValue().toString());
-                    break;
-                case "orderref3":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOrderref3(queryList.getQueryValue().toString());
-                    break;
-                case "orderref4":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOrderref4(queryList.getQueryValue().toString());
-                    break;
-                case "orderref5":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOrderref5(queryList.getQueryValue().toString());
-                    break;
-                case "rolldate":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRolldate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
-                    break;
-                case "createddate":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setCreateddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
-                    break;
-                case "tatusDb":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setStatusDb(queryList.getQueryValue().toString());
-                    break;
-                case "status":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setStatus(queryList.getQueryValue().toString());
-                    break;
-                case "supprollno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSupprollno(queryList.getQueryValue().toString());
-                    break;
-                case "rollseqno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRollseqno(Integer.valueOf(queryList.getQueryValue().toString()));
-                    break;
-                case "supprollnoflag":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSupprollnoflag(queryList.getQueryValue().toString());
-                    break;
-                case "sourcetype":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSourcetype(queryList.getQueryValue().toString());
-                    break;
-                case "originalrollno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOriginalrollno(queryList.getQueryValue().toString());
-                    break;
-                case "rolltype":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRolltype(queryList.getQueryValue().toString());
-                    break;
-                case "rolltypeDb":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRolltypeDb(queryList.getQueryValue().toString());
-                    break;
-                case "firstlevelrollno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setFirstlevelrollno(queryList.getQueryValue().toString());
-                    break;
-                case "remark":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRemark(queryList.getQueryValue().toString());
-                    break;
-                case "parttypeFlag":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setParttypeFlag(queryList.getQueryValue().toString());
-                    break;
-                case "warehouseid":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setWarehouseid(queryList.getQueryValue().toString());
-                    break;
-                case "synchronizedflag":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setSynchronizedflag(queryList.getQueryValue().toString());
-                    break;
-                case "consumeorderno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setConsumeorderno(queryList.getQueryValue().toString());
-                    break;
-                case "consumeseqno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setConsumeseqno(Integer.valueOf(queryList.getQueryValue().toString()));
-                    break;
-                case "customerid":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setCustomerid(queryList.getQueryValue().toString());
-                    break;
-                case "fgpartno":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setFgpartno(queryList.getQueryValue().toString());
-                    break;
-                case "refSupplierid":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRefSupplierid(queryList.getQueryValue().toString());
-                    break;
-                case "refPartdesc":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setRefPartdesc(queryList.getQueryValue().toString());
-                    break;
-                case "needsynchronizeflag":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setNeedsynchronizeflag(queryList.getQueryValue().toString());
-                    break;
-                case "opslog":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setOpslog(queryList.getQueryValue().toString());
-                    break;
-                case "frozenflag":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setFrozenflag(queryList.getQueryValue().toString());
-                    break;
-                case "frozenby":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setFrozenby(queryList.getQueryValue().toString());
-                    break;
-                case "expireddate":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setExpireddate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
-                    break;
-                case "manufacturedate":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString()))
-                        cRollinfoVo.setManufacturedate(DateUtils.stringToDate(queryList.getQueryValue().toString(), "yyyy-MM-dd"));
-                    break;
-                case "toexpiredays":
-                    if (StringUtils.isNotEmpty(queryList.getQueryValue().toString())) {
-                        cRollinfoVo.setToexpiredays(Integer.valueOf(queryList.getQueryValue().toString()));
-                    }
-                    break;
-            }
-        }
-        List<CRollinfoVo> list = this.baseMapper.getCRollinfoList(cRollinfoVo);
-        return list;
+    public PageUtils getCRollinfoList(CRollinfoVo cRollinfoVo) {
+        IPage<CRollinfoVo> cRollinfoList = this.baseMapper.getCRollinfoList(
+                new Page<CRollinfoVo>(cRollinfoVo.getPage(), cRollinfoVo.getLimit()),cRollinfoVo);
+        return new PageUtils(cRollinfoList);
     }
 
     @Override

src/main/java/com/gaotao/modules/finishedProduct/vo/CRollinfoVo.java

@@ -3,113 +3,34 @@ package com.gaotao.modules.finishedProduct.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gaotao.modules.finishedProduct.entity.CRollinfoEntity;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 @Data
-public class CRollinfoVo {
+public class CRollinfoVo extends CRollinfoEntity {
 
+    private int limit;
 
-    private String site;
+    private int page;
 
-    private String rollno;
-
-    private Double rollqty;
-
-    private String partno;
-
-    private String supplierid;
-
-    private String orderref1;
-
-    private String orderref2;
-
-    private String orderref3;
-
-    private String orderref4;
-
-    private String suppdeliverynote;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date rolldate;
-
-    private Date createddate;
-
-    private String createdby;
-
-    private String statusDb;
-
-    private String status;
-
-    private String supprollno;
-
-    private Integer rollseqno;
-
-    private String supprollnoflag;
-
-    private String sourcetype;
-
-    private String originalrollno;
-
-    private String orderref5;
-
-    private String rolltype;
-
-    private String rolltypeDb;
-
-    private String firstlevelrollno;
-
-    private String remark;
-
-    private String parttypeFlag;
-
-    private String warehouseid;
-
-    private String synchronizedflag;
-
-    private String consumeorderno;
-
-    private Integer consumeseqno;
-
-    private String customerid;
-
-    private String fgpartno;
-
-    private String refSupplierid;
-
-    private String refPartdesc;
-
-    private String needsynchronizeflag;
-
-    private String opslog;
-
-    private String frozenflag;
+    private String partDescription;
 
-    private Date frozendate;
+    private Integer toexpiredays;
 
-    private String frozenby;
-    /**
-     * 失效日期
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date expireddate;
-    /**
-     * 制造日期
-     */
+    private Date startDate;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date manufacturedate;
+    private Date endDate;
 
+    private Integer day1;
 
-    private String partDescription;
+    private Integer day2;
 
-    private String expiredatecontrolflag;
-
-    private Integer toexpiredays;
+    private String sourceType;
 
-    private Double pickQty;
 }

src/main/resources/mapper/finishedProduct/CRollinfoDao.xml

@@ -106,134 +106,62 @@
         LEFT JOIN Part AS p ON ( r.PartNo = p.PartNo AND r.Site = p.Site )
         <where>
             Status_DB = 'I'
-            <if test="parttypeFlag != null">
-                AND r.parttype_flag = #{parttypeFlag}
+            <if test="query.parttypeFlag != null and query.parttypeFlag != '' ">
+                AND r.parttype_flag = #{query.parttypeFlag}
             </if>
-            <if test="rollno != null">
-                AND r.RollNo like #{rollno}
+            <if test="query.rollno != null and query.rollno != ''">
+                AND r.RollNo like #{query.rollno}
             </if>
-            <if test=" site != null">
-                AND r.Site like #{site}
+            <if test=" query.site != null and query.site != '' ">
+                AND r.Site like #{query.site}
             </if>
-            <if test="partDescription != null">
-                AND p.PartDescription like #{partDescription}
+            <if test=" query.sourceType != null and query.sourceType != '' ">
+                AND r.SourceType = #{query.sourceType}
             </if>
-            <if test="rollqty != null">
-                AND r.RollQty = #{rollqty}
+            <if test="query.partDescription != null and query.partDescription != '' ">
+                AND p.PartDescription like #{query.partDescription}
             </if>
-            <if test="partno != null">
-                AND r.PartNo like #{partno}
+            <if test="query.rollqty != null and query.rollqty != '' ">
+                AND r.RollQty = #{query.rollqty}
             </if>
-            <if test="supplierid != null">
-                AND r.SupplierID like #{supplierid}
+            <if test="query.partno != null and query.partno != ''  ">
+                AND r.PartNo like #{query.partno}
             </if>
-            <if test="orderref1 != null">
-                AND r.OrderRef1 like #{orderref1}
-            </if>
-            <if test="orderref2 != null">
-                AND r.OrderRef2 like #{orderref2}
-            </if>
-            <if test="orderref3 != null">
-                AND r.OrderRef3 like #{orderref3}
-            </if>
-            <if test="orderref4 != null">
-                AND r.OrderRef4 like #{orderref4}
-            </if>
-            <if test="suppdeliverynote != null">
-                AND r.SuppDeliveryNote like #{suppdeliverynote}
-            </if>
-            <if test="rolldate != null">
-                AND r.RollDate <![CDATA[=]]> #{rolldate}
-            </if>
-            <if test="createddate != null">
-                AND r.CreatedDate <![CDATA[=]]> #{createddate}
-            </if>
-            <if test="createdby != null">
-                AND r.CreatedBy like #{createdby}
-            </if>
-            <if test="statusDb != null">
-                AND r.Status_DB like #{statusDb}
-            </if>
-            <if test="status != null">
-                AND r.Status like #{status}
-            </if>
-            <if test="supprollno != null">
-                AND r.SuppRollNo like #{supprollno}
-            </if>
-            <if test="rollseqno != null">
-                AND r.RollSeqNo like #{rollseqno}
-            </if>
-            <if test="supprollnoflag != null">
-                AND r.SuppRollNoFlag like #{supprollnoflag}
-            </if>
-            <if test="sourcetype != null">
-                AND r.SourceType like #{sourcetype}
-            </if>
-            <if test="originalrollno != null">
-                AND r.OriginalRollNo like #{originalrollno}
-            </if>
-            <if test="orderref5 != null">
-                AND r.OrderRef5 like #{orderref5}
-            </if>
-            <if test="rolltype != null">
-                AND r.rolltype like #{rolltype}
-            </if>
-            <if test="rolltypeDb != null">
-                AND r.rolltype_db like #{rolltypeDb}
-            </if>
-            <if test="firstlevelrollno != null">
-                AND r.firstlevelrollno like #{firstlevelrollno}
-            </if>
-            <if test="remark != null">
-                AND r.remark like #{remark}
-            </if>
-            <if test="warehouseid != null">
-                AND r.warehouseidV like #{warehouseid}
-            </if>
-            <if test="synchronizedflag != null">
-                AND r.synchronizedFlag like #{synchronizedflag}
-            </if>
-            <if test="consumeorderno != null">
-                AND r.ConsumeOrderNo like #{consumeorderno}
-            </if>
-            <if test="consumeseqno != null">
-                AND r.ConsumeSeqNo like #{consumeseqno}
-            </if>
-            <if test="customerid != null">
-                AND r.CustomerID like #{customerid}
-            </if>
-            <if test="fgpartno != null">
-                AND r.FGPartNo like #{fgpartno}
-            </if>
-            <if test="refSupplierid != null">
-                AND r.Ref_SupplierID like #{refSupplierid}
-            </if>
-            <if test="refPartdesc != null">
-                AND r.Ref_PartDesc like #{refPartdesc}
-            </if>
-            <if test="needsynchronizeflag != null">
-                AND r.NeedsynchronizeFlag like #{needsynchronizeflag}
-            </if>
-            <if test="opslog != null">
-                AND r.OpsLog like #{opslog}
+
+            <if test="query.rolltype != null and query.rolltype != '' ">
+                AND r.rolltype like #{query.rolltype}
             </if>
-            <if test="frozenflag != null">
-                AND r.frozenflag like #{frozenflag}
+            <if test="query.rolltypeDb != null and query.rolltypeDb != '' ">
+                AND r.rolltype_db like #{query.rolltypeDb}
             </if>
-            <if test="frozendate != null">
-                AND r.frozendate <![CDATA[=]]>  #{frozendate}
+            <if test="query.startDate != null ">
+                AND r.ExpiredDate <![CDATA[ >= ]]> #{query.startDate}
             </if>
-            <if test="frozenby != null">
-                AND r.frozenby like #{frozenby}
+            <if test="query.endDate != null ">
+                AND r.ExpiredDate <![CDATA[ <= ]]> #{query.endDate}
             </if>
-            <if test="expireddate != null">
-                AND r.ExpiredDate <![CDATA[=]]> #{expireddate}
+            <if test="query.manufacturedate != null">
+                AND r.ManufactureDate <![CDATA[=]]> #{query.manufacturedate}
             </if>
-            <if test="manufacturedate != null">
-                AND r.ManufactureDate <![CDATA[=]]> #{manufacturedate}
+            <if test=" query.day1 != null and query.day1 != 0 ">
+                AND ( CASE
+                WHEN ExpiredDate IS NULL THEN
+                0 ELSE
+                CASE
+                WHEN GETDATE( ) > ExpiredDate THEN
+                datediff( DAY, ExpiredDate, GETDATE( ) ) ELSE 0
+                END
+                END ) <![CDATA[>=]]> #{query.day1}
             </if>
-            <if test=" toexpiredays != null">
-                AND datediff( DAY, r.CreatedDate ,GETDATE( ) ) <![CDATA[>=]]> #{toexpiredays}
+            <if test=" query.day2 != null and query.day2 != 0 ">
+                AND ( CASE
+                WHEN ExpiredDate IS NULL THEN
+                0 ELSE
+                CASE
+                WHEN GETDATE( ) > ExpiredDate THEN
+                datediff( DAY, ExpiredDate, GETDATE( ) ) ELSE 0
+                END
+                END ) <![CDATA[<=]]> #{query.day2}
             </if>
         </where>
         ORDER BY r.CreatedDate desc