Merge remote-tracking branch 'origin/dev-2.20.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/mapping/UnitInfoMapper.xml

@@ -18,7 +18,7 @@
     </select>
 
 
-    <!--<select id="selectMyPage" resultType="com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO">
+    <select id="selectMyPage" resultType="com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO">
         select t1.*, t2.DICT_LABEL dictLabel
         from biz_unit_info t1
         left join dev_dict t2 on t1.dwlx = t2.id
@@ -34,7 +34,7 @@
 
         order by t1.create_time desc
 
-    </select>-->
+    </select>
 
     <select id="getDwGjjDate" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/KcswDefaultMapper.java

@@ -41,7 +41,7 @@ public interface KcswDefaultMapper extends BaseMapper<DataKcglKcswDefault> {
 
     List<CrkChartDataVO> getCrkChartDataByDj(@Param("crkCharParam") CrkCharParam crkCharParam);
 
-    List<CrkKcswXzDataVO> getXzList(@Param("xz") String xz, @Param("orgId") String orgId);
+    List<CrkKcswXzDataVO> getXzList( @Param("xz") String xz, @Param("orgId") String orgId,@Param("cityId") String cityId);
 
     CrkJyxxDataVO getJyxxDetail(@Param("dataId") String dataId);
 
@@ -57,8 +57,9 @@ public interface KcswDefaultMapper extends BaseMapper<DataKcglKcswDefault> {
 
     /**
      * 得到小麦粉，大米不同性质库存信息，在成品粮库存实物表进行查询
+     *
      * @param xz
-     * @param orgId_
+     * @param orgId
      * @return
      */
     CrkKcswXzDataVO getMzlDataByxz(@Param("xz") String xz, @Param("orgId") String orgId);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/mapping/KcswDefaultMapper.xml

@@ -110,6 +110,7 @@
         depot_qh.org_info b
         LEFT JOIN  depot_qh.data_kcgl_kcsw_default a on a.UnitID=b.org_id
         LEFT JOIN depot_qh.basic_enum b1_enum ON b1_enum.enumId = IFNULL(a.pz,'3164')
+        LEFT JOIN  province_all.biz_unit_info f  on b.unit_info_id = f.id
     WHERE
         IFNULL(a.hwxz,'6877') IN (${xz}) and IFNULL(a.pz,'3164') in (3164,3166,8000)
         <if test="orgId == null or orgId == ''">
@@ -118,6 +119,9 @@
         <if test="orgId != null and orgId != ''">
             and b.org_id = #{orgId}
         </if>
+        <if test="cityId != null and cityId != ''">
+            AND f.zcdz_city  = #{cityId}
+        </if>
     GROUP BY
         b.org_id,a.pz
     ) x

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/CrkKcswParam.java

@@ -29,7 +29,10 @@ import javax.validation.constraints.NotNull;
 public class CrkKcswParam {
 
     @ApiModelProperty(value = "粮食性质: 6877：省级，6878：市级，6879：县级")
-    String lsxz;
+    private String lsxz;
+
+    @ApiModelProperty(value = "市州Id")
+    private String cityId;
 
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/KcswDefaultPageParam.java

@@ -50,6 +50,9 @@ public class KcswDefaultPageParam {
     @ApiModelProperty(value = "粮食品种名称")
     String lspzName;
 
+    @ApiModelProperty(value = "检验结果")
+    String jyjg;
+
     @ApiModelProperty(value = "单据号")
     String bizNo;
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/service/impl/KcswDefaultServiceImpl.java

@@ -70,6 +70,9 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
         if (StringUtils.isNotBlank(pageParam.getLspzName())){
             queryWrapper.like("b_2.enumName",pageParam.getLspzName());
         }
+        if (StringUtils.isNotBlank(pageParam.getJyjg())){
+            queryWrapper.like("DATA_CRKYW_JYXX_DEFAULT.jyjg",pageParam.getJyjg());
+        }
         if (StringUtils.isNotBlank(pageParam.getCph())){
             queryWrapper.like("DATA_CRKYW_RMDJ_DEFAULT.cph",pageParam.getCph());
         }
@@ -112,13 +115,14 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
         String xj = "6879"; //县级储备
         Boolean isFilter = false; //是否性质条件过滤
         String orgId = "";
+        String cityId = crkKcswParam.getCityId();
         Double mzl = 0.7; //折算比例，默认0.7
         if (StringUtils.isNotBlank(crkKcswParam.getLsxz())){ //表示需要进行过滤
             xz = crkKcswParam.getLsxz();
             isFilter = true;
         }
 
-        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId);
+        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId,cityId);
         for(CrkKcswXzDataVO xzDataVO:dfcbList){
             String orgId_ = xzDataVO.getOrgId();
             CrkKcswDataVO crkKcswDataVO = new CrkKcswDataVO();
@@ -156,7 +160,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             if (!isFilter ||(isFilter  && StringUtils.equals(sj,crkKcswParam.getLsxz()))) {
                 //省级储备
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_);
+                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_,cityId);
                 if (sjcbList.size() > 0) {
                     CrkKcswXzDataVO sjcb = sjcbList.get(0);
                     //得到省级小麦，大米
@@ -193,7 +197,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             //市级储备
             if (!isFilter ||(isFilter  && StringUtils.equals(cj,crkKcswParam.getLsxz()))) {
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_);
+                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_,cityId);
                 if (cjcbList.size() > 0) {
                     CrkKcswXzDataVO cjcb = cjcbList.get(0);
                     //得到市级小麦，大米
@@ -229,7 +233,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             //县级储备
             if (!isFilter ||(isFilter  && StringUtils.equals(xj,crkKcswParam.getLsxz()))) {
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_);
+                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_,cityId);
                 if (xjcbList.size() > 0) {
                     CrkKcswXzDataVO xjcb = xjcbList.get(0);
                     //得到县级小麦，大米