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

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/entity/OrgInfo.java

@@ -296,5 +296,6 @@ public class OrgInfo {
     private String unitInfoId;
 
     @TableField(exist = false)//企业名称
+    @ApiModelProperty(value = "企业名称", position = 67)
     private String qymc;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/service/impl/OrgInfoServiceImpl.java

@@ -125,6 +125,12 @@ public class OrgInfoServiceImpl extends ServiceImpl<OrgInfoMapper, OrgInfo> impl
         if(ObjectUtil.isEmpty(orgInfo)) {
             throw new CommonException("组织机构信息表不存在，id值为：{}", id);
         }
+        if(StringUtils.isNotBlank(orgInfo.getUnitInfoId())){
+            UnitInfo unitInfo = unitInfoServiceImpl.queryEntity(orgInfo.getUnitInfoId());
+            if (unitInfo != null){
+                orgInfo.setQymc(unitInfo.getDwmc());
+            }
+        }
         return orgInfo;
     }
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpBiweeklyReport/mapper/mapping/RpBiweeklyReportMapper.xml

@@ -74,8 +74,7 @@
                         depot_qh.data_kcgl_fcbgz_default m1
                 INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
                 INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno
-                INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-                where m4.jhdID = a.rp_report_id
+                where m3.jhdID = a.rp_report_id
 
             )  as "ckslSum",
             SUM(e.plan_quantity) as "inPlanQuantity",
@@ -85,8 +84,7 @@
                         depot_qh.data_kcgl_fcbgz_default m1
                 INNER JOIN depot_qh.data_crkyw_cpz_default m2 ON m1.DataID = m2.DataID
                 INNER JOIN depot_qh.data_crkyw_rmdj_default m3 ON m3.bizno = m2.bizno
-                INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-                where m4.jhdID = a.rp_report_id
+                where m3.jhdh = a.rp_report_id
             )  as "rkslSum"
         FROM
         biz_rp_issuance a
@@ -111,8 +109,7 @@
 							depot_qh.data_kcgl_fcbgz_default m1
 					INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
 					INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno
-					INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-					where m4.jhdID = a.rp_report_id
+					where m3.jhdID = a.rp_report_id
 
 				)  as "ckslSum",
 				SUM(e.plan_quantity) as "inPlanQuantity",
@@ -122,8 +119,7 @@
 							depot_qh.data_kcgl_fcbgz_default m1
 					INNER JOIN depot_qh.data_crkyw_cpz_default m2 ON m1.DataID = m2.DataID
 					INNER JOIN depot_qh.data_crkyw_rmdj_default m3 ON m3.bizno = m2.bizno
-					INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-					where m4.jhdID = a.rp_report_id
+					where m3.jhdh = a.rp_report_id
 				)  as "rkslSum"
         FROM
         biz_rp_issuance a
@@ -151,8 +147,7 @@
 							depot_qh.data_kcgl_fcbgz_default m1
 					INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
 					INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno
-					INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-					where m4.jhdID = a.rp_report_id
+					where m3.jhdID = a.rp_report_id
 
 				)  as "ckslSum",
 				SUM(e.plan_quantity) as "inPlanQuantity",
@@ -162,8 +157,7 @@
 							depot_qh.data_kcgl_fcbgz_default m1
 					INNER JOIN depot_qh.data_crkyw_cpz_default m2 ON m1.DataID = m2.DataID
 					INNER JOIN depot_qh.data_crkyw_rmdj_default m3 ON m3.bizno = m2.bizno
-					INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-					where m4.jhdID = a.rp_report_id
+					where m3.jhdh = a.rp_report_id
 				)  as "rkslSum"
         FROM
         biz_rp_issuance a

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/entity/VO/RotationPlanChart.java

@@ -31,10 +31,10 @@ public class RotationPlanChart {
     private BigDecimal inPlanQuantity ;
 
     @ApiModelProperty(value = "出库总重量(数字，单位kg）", position = 5)
-    private BigDecimal cksl;
+    private BigDecimal ckslSum;
 
     @ApiModelProperty(value = "入库总重量(数字，单位kg）", position = 6)
-    private BigDecimal rksl;
+    private BigDecimal rkslSum;
 
     @ApiModelProperty(value = "出库百分比(数字，单位%）", position = 7)
     private BigDecimal ckRate;

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/mapping/GrainOilReserveMapper.xml

@@ -121,8 +121,7 @@ ORDER  by pz
                         depot_qh.data_kcgl_fcbgz_default m1
                 INNER JOIN depot_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
                 INNER JOIN depot_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno
-                INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-                where m4.jhdID = a.rp_report_id
+                where m3.jhdID = a.rp_report_id
 
             )  as "ckslSum",
              IFNULL(SUM(e.plan_quantity),0.0) as "inPlanQuantity",
@@ -132,8 +131,7 @@ ORDER  by pz
                         depot_qh.data_kcgl_fcbgz_default m1
                 INNER JOIN depot_qh.data_crkyw_cpz_default m2 ON m1.DataID = m2.DataID
                 INNER JOIN depot_qh.data_crkyw_rmdj_default m3 ON m3.bizno = m2.bizno
-                INNER JOIN depot_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-                where m4.jhdID = a.rp_report_id
+                where m3.jhdh = a.rp_report_id
             )  as "rkslSum"
         FROM
          province_all.biz_rp_issuance a

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/service/impl/GrainOilReserveServiceImpl.java

@@ -113,8 +113,8 @@ public class GrainOilReserveServiceImpl  implements GrainOilReserveService {
         RotationPlanChart planChart= grainOilReserveMapper.getRotationPalnChartDatas();
         BigDecimal outPlanQuantity = planChart.getOutPlanQuantity();// 计划出库
         BigDecimal inPlanQuantity = planChart.getInPlanQuantity();// 计划入库
-        BigDecimal cksl = planChart.getCksl()!=null?planChart.getCksl():NumberUtil.toBigDecimal(0.0);// 出库数量
-        BigDecimal rksl = planChart.getRksl()!=null?planChart.getRksl():NumberUtil.toBigDecimal(0.0);// 入库数量
+        BigDecimal cksl = planChart.getCkslSum()!=null?planChart.getCkslSum():NumberUtil.toBigDecimal(0.0);// 出库数量
+        BigDecimal rksl = planChart.getRkslSum()!=null?planChart.getRkslSum():NumberUtil.toBigDecimal(0.0);// 入库数量
         BigDecimal ckRate = NumberUtil.div(cksl,NumberUtil.mul(outPlanQuantity,1000)); //出库比例
         BigDecimal rkRate = NumberUtil.div(rksl,NumberUtil.mul(inPlanQuantity,1000)); //入库比例
         planChart.setCkRate(ckRate);