修改sql

Signed-off-by: tangsong <86121657@qq.com>

src/main/java/com/jusfoun/ydylsz/service/ChengPinYuanLiangService.java

@@ -1,5 +1,7 @@
 package com.jusfoun.ydylsz.service;
 
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.jusfoun.ydylsz.mapper.XwkTfzybMapper;
@@ -7,12 +9,15 @@ import com.jusfoun.ydylsz.vo.XwkTfzyb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class ChengPinYuanLiangService {
 
-	@Autowired
+	@Resource
 	private XwkTfzybMapper xwkTfzybMapper;
 
 	public List<XwkTfzyb> list(String cfbh) {
@@ -35,6 +40,7 @@ public class ChengPinYuanLiangService {
 	public PageInfo<XwkTfzyb> tfPage(XwkTfzyb xwkTfzyb, Integer pageNum, Integer pageSize) {
 		PageHelper.startPage(pageNum, pageSize);
 		return new PageInfo<XwkTfzyb>(xwkTfzybMapper.tfPage(xwkTfzyb));
+
 	}
 
 

src/main/resources/mapper/DCfxxsjyMapper.xml

@@ -80,12 +80,12 @@
                kc.FCSL,
                kc.KCSL,
                case
-                when kc.lslb == '1' and kc.kcsl > 0 then '封仓'
+                when kc.lslb = '1' and kc.kcsl > 0 then '封仓'
                  else (
                     case
-                    when ifnull(kc.hwzt, '1') == '1' or ifnull(kc.kcsl, 0) = 0 then '空仓'
-                    when kc.hwzt == '2' then '入库'
-                    when kc.hwzt == '4' then '出库'
+                    when ifnull(kc.hwzt, '1') = '1' or ifnull(kc.kcsl, 0) = 0 then '空仓'
+                    when kc.hwzt = '2' then '入库'
+                    when kc.hwzt = '4' then '出库'
                     else '封仓'
                   end)
                end as cfzt,
@@ -347,10 +347,10 @@
 		  b.id as hwbm,
 		  b.ygmc as cfmc,
 		  b.kddm,
-		 (case when b.ygzt == '1' then '空罐'
-		       when b.ygzt == '2' then '入库'
-		       when b.ygzt == '3' then '出库'
-		       when b.ygzt == '4' then '满罐'
+		 (case when b.ygzt = '1' then '空罐'
+		       when b.ygzt = '2' then '入库'
+		       when b.ygzt = '3' then '出库'
+		       when b.ygzt = '4' then '满罐'
 		       else '' end) as cfzt,
 
 		  a.pzbm,
@@ -379,10 +379,10 @@
 		  b.id as hwbm,
 		  b.ygmc as cfmc,
 		  b.kddm,
-		 (case when b.ygzt == '1' then '空罐'
-		       when b.ygzt == '2' then '入库'
-		       when b.ygzt == '3' then '出库'
-		       when b.ygzt == '4' then '满罐'
+		 (case when b.ygzt = '1' then '空罐'
+		       when b.ygzt = '2' then '入库'
+		       when b.ygzt = '3' then '出库'
+		       when b.ygzt = '4' then '满罐'
 		       else '' end) as cfzt,
 
 		  a.pzbm,
@@ -461,7 +461,7 @@
 		cf.fwkd, cf.zlxgd, cf.tczj, cf.cmsl, cf.cmgd, cf.cmkd, cf.tffs, cf.grfs, cf.kwcs,
 		cf.jd, cf.wd, cf.qyrq, cf.jsnd, cf.dczlrj, cf.cfbm,(select kdmc from base.d_kdxxsjy where kddm= cf.kddm) as
 		qymc,
-		kc.pzbm,kc.LSXZBM,kc.DJBM,kc.RKSJ,kc.SHND,kc.FCSJ,kc.KCSL,case when kc.lslb == '1' and kc.kcsl>0 then '满仓' else kc.cfzt end as cfzt,kc.gb
+		kc.pzbm,kc.LSXZBM,kc.DJBM,kc.RKSJ,kc.SHND,kc.FCSJ,kc.KCSL,case when kc.lslb = '1' and kc.kcsl>0 then '满仓' else kc.cfzt end as cfzt,kc.gb
 		from base.D_CFXXSJY cf
 		left join
 		(select  KCXXID, k.HWBM, ND, QJ,
@@ -470,9 +470,9 @@
 		(select enumname from basic_enum where enumid= k.DJBM) as DJBM,
 		RKSJ, SHND, FCSJ, FCSL, KCSL,
 		  (case
-              when ifnull(k.hwzt, '1') == '1' or ifnull(kc.kcsl, 0) = 0 then '空仓'
-              when k.hwzt == '2' then '入库'
-              when k.hwzt == '4' then '出库'
+              when ifnull(k.hwzt, '1') = '1' or ifnull(kc.kcsl, 0) = 0 then '空仓'
+              when k.hwzt = '2' then '入库'
+              when k.hwzt = '4' then '出库'
               else '满仓' end
 		  ) as cfzt,
 		(select distinct  enumitemname from enumitem where  enumitemid=k.gb) as gb,k.lslb
@@ -519,10 +519,10 @@
 		b.kddm,
 		(
 			case
-				when k.crk_status == '1' then '空罐'
-				when k.crk_status == '2' then '入库'
-				when k.crk_status == '3' then '封罐'
-				when k.crk_status == '4' then '出库'
+				when k.crk_status = '1' then '空罐'
+				when k.crk_status = '2' then '入库'
+				when k.crk_status = '3' then '封罐'
+				when k.crk_status = '4' then '出库'
 				else ''
 			end
 		) as cfzt,

src/main/resources/mapper/XwkChjcMapper.xml

@@ -357,10 +357,10 @@
 		  b.zygd,
 		  b.ygcykgd,
 		  b.ygjckgd,
-		 (case when b.ygzt == '1' then '空罐'
-		       when b.ygzt == '2' then '入库'
-		       when b.ygzt == '3' then '出库'
-		       when b.ygzt == '4' then '满罐'
+		 (case when b.ygzt = '1' then '空罐'
+		       when b.ygzt = '2' then '入库'
+		       when b.ygzt = '3' then '出库'
+		       when b.ygzt = '4' then '满罐'
 		       else '' end) as cfzt,
 		  a.pzbm,
 		  a.lsxzbm,