质量抽查：已检查数更新流程修改

hnxtba-core/src/main/java/com/founder/service/impl/AfisQualityServiceImpl.java

@@ -584,11 +584,14 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
             //先进行该单位已经抽查数据进行ccbs清空
             mapper.clearCcbs(map);
             //获取该抽查编号的检查份数
-//            Integer sjjcfs = mapper.queryjcsl(map);
+            Integer sjjcfs = mapper.queryjcsl(map);
             map.put("xxbh", entity.getCcbh());
             List<AfisQualityCcrw> xyrCs = afisQualityCcrwDao.getAfisQualityCcrw(map);
             // 如果检查份数小于抽查份数 ，则先查询出已经检查份数，剩余未检查的在随机抽查
-            jcfs = Integer.parseInt(xyrCs.get(0).getJcfs()) == jcfs ? jcfs : Math.min(jcfs, Integer.parseInt(xyrCs.get(0).getJcfs()));
+            jcfs =  sjjcfs ;
+            if (Integer.parseInt(xyrCs.get(0).getJcfs() ) != sjjcfs) {
+            this.mapper.addAfisQualityCcfs(map);
+            }
             int wjcfs = ccfs - jcfs;
             log.info("未采集数：{},抽查份数：{}，已检查份数：{}", wjcfs, ccfs, jcfs);
             if (wjcfs > 0) {
@@ -889,13 +892,6 @@ public class AfisQualityServiceImpl extends BaseService<AfisQualityCk> implement
         return bool && flag;
     }
 
-    public static void main(String[] args) {
-        String s1 = new StringBuilder("go").append("od").toString();
-        System.out.println(s1.intern() == s1);
-        String s2 = new StringBuilder("ja").append("va").toString();
-        System.out.println(s2.intern() == s2);
-    }
-
     @Override
     public boolean chexiaoZlcc(String zwbh, String ccbh) {
         Map map = new HashMap();

hnxtba-core/src/main/java/com/founder/service/impl/AutoTbXwRycjServiceImpl.java

 package com.founder.service.impl;
 
 import com.founder.dao.TbXwRycjDao;
-import com.founder.jwzhdao.JwzhDao;
+import com.founder.jwzhDao.JwzhDao;
 import com.founder.model.AutoTbStRy;
 import com.founder.model.AutoTbStRyDto;
 import com.founder.service.AutoTbXwRycjService;
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 import static com.founder.model.Constant.*;

hnxtba-core/src/main/java/com/founder/utils/DateUtil.java

@@ -211,7 +211,6 @@ public class DateUtil {
 	/**
 	 * 将字符串格式yyyy/MM/dd HH24:MI:SS、yyyy/MM/dd 、yyyy/MM/dd HH24:MI:SS、yyyy/MM/dd格式 转换日期类型
 	 * @author zhouwei
-	 * @param strDate
 	 * @return Date
 	 */
 	public static Date commonStringToDate(String time){

hnxtba-core/src/main/resources/mapper/AfisQualityCcrwSqlMapper.xml

@@ -110,8 +110,7 @@
         A.BZ as bz,
         A.CJSJ as cjsj,
         A.CCNR as ccnr
-        from AFIS_QUALITY_CCRW A where 1=1
-        AND A.SCBZ = '0'
+        from AFIS_QUALITY_CCRW A where  A.SCBZ = '0'
         <include refid="queryWhere"/>
         <![CDATA[ order by ${sort} ${order}  ) a
         WHERE ROWNUM <= #{ end } ) t
@@ -134,8 +133,7 @@
         A.RWBZ as rwbz,
         A.CJSJ as cjsj,
         A.CCNR as ccnr
-        from AFIS_QUALITY_CCRW A where 1=1
-        AND A.SCBZ = '0'
+        from AFIS_QUALITY_CCRW A where  A.SCBZ = '0'
         and A.XXBH = #{xxbh , jdbcType=VARCHAR }
         <if test="rwbz != null and rwbz != ''">
             and A.RWBZ = #{rwbz , jdbcType=VARCHAR }
@@ -158,8 +156,7 @@
         A.RWBZ as rwbz,
         A.CJSJ as cjsj,
         A.CCNR as ccnr
-        from AFIS_QUALITY_CCRW A where 1=1
-        AND A.SCBZ = '0'
+        from AFIS_QUALITY_CCRW A where  A.SCBZ = '0'
         and A.RWBH = #{rwbh , jdbcType=VARCHAR }
     </select>