Merge branch 'dev-2.19.2' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/entity/FsSaleRevenue.java

@@ -85,7 +85,7 @@ public class FsSaleRevenue implements Serializable {
     private String problemFeedback;
 
     /** 状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报； */
-    @ApiModelProperty(value = "状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报；", position = 12)
+    @ApiModelProperty(value = "状态 0：库级系统-保存；1：库级系统-上报；2：省级平台-已核定；3：省级平台-上报；", position = 12)
     private Integer status;
 
     // 只展示不保存

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/rotationCostSubsidySettle/controller/RotationCostSubsidySettleController.java

@@ -52,6 +52,13 @@ public class RotationCostSubsidySettleController {
     @Resource
     private RotationCostSubsidySettleService rotationCostSubsidySettleService;
 
+    /**
+     * 分页查询
+     *  数据来自定时任务(taskAction)
+     *  定时任务设置 dev_job 表,类:com.unis.financialSupervision.modular.rotationCostSubsidySettle.task.RotationCostSubsidyTaskRunner
+     * @param planYear
+     * @return
+     */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取轮换费用补贴清算列表")
 //    @SaCheckPermission("/financialSupervision/rotationCostSubsidySettle/page")

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/rotationCostSubsidySettle/mapper/mapping/RotationCostSubsidySettleMapper.xml

@@ -13,7 +13,7 @@
         SELECT
             t1.orgId,
             t1.orgName,
-            t1.outPlanNumber staticRawGrainPlanQuantity,
+            t1.plan_quantity staticRawGrainPlanQuantity,
             (t1.sealing_quantity + t2.quantity)/(t1.outPlanNumber + t2.inPlanNumber) staticRawGrainCompletionRate,
             t1.standard_value staticRawGrainCostStandard,
             (t1.outPlanNumber + t2.inPlanNumber) * t1.standard_value staticRawGrainSubsidy,
@@ -22,7 +22,22 @@
             t3.standard_value dynamicRawGrainCostStandard,
             (t3.outPlanNumber + t4.inPlanNumber) * t3.standard_value dynamicRawGrainSubsidy,
             t1.planYear,
-            t1.remarks remark
+            t1.remarks remark,
+            t5.processedGrainPlanQuantity,
+            t5.processedGrainCostStandard,
+            t5.processedGrainSubsidy,
+            t5.otherSubsidy,
+            (
+                (
+                    (
+                        t1.outPlanNumber + t2.inPlanNumber
+                    ) * t1.standard_value
+                ) + (
+                    (
+                        t3.outPlanNumber + t4.inPlanNumber
+                    ) * t3.standard_value
+                ) + t5.processedGrainSubsidy + t5.otherSubsidy
+            ) subsidySubtotal
         FROM
             (
                 SELECT
@@ -30,9 +45,9 @@
                     oi.org_name orgName,
                     bri.plan_number outPlanNumber,
                     bri.plan_year planYear,
-                    bro.plan_quantity,
-                    bro.sealing_quantity,
-                    bfcs.standard_value,
+                    SUM(bro.plan_quantity) plan_quantity,
+                    SUM(bro.sealing_quantity) sealing_quantity,
+                    SUM(bfcs.standard_value) standard_value,
                     bro.remarks
                 FROM
                     biz_rp_issuance bri
@@ -46,16 +61,18 @@
                 AND brr.rotation_year = YEAR (NOW())
                 AND bri.plan_year = YEAR (NOW())
                 AND bfcs.standard_type = 1
+                GROUP BY
+		          bro.org_id
             ) t1
         LEFT JOIN (
             SELECT
                 brin.org_id orgId,
                 oi.org_name orgName,
                 bri.plan_number inPlanNumber,
-                bfcs.standard_value,
+                SUM(bfcs.standard_value) standard_value,
                 bri.plan_year planYear,
-                brin.plan_quantity,
-                brin.quantity
+                SUM(brin.plan_quantity) plan_quantity,
+		        SUM(brin.quantity) quantity
             FROM
                 biz_rp_issuance bri
             INNER JOIN depot_qh.business_rp_report brr ON bri.rp_report_id = brr.id
@@ -68,6 +85,8 @@
             AND brr.rotation_year = YEAR (NOW())
             AND bri.plan_year = YEAR (NOW())
             AND bfcs.standard_type = 1
+            GROUP BY
+		      brin.org_id
         ) t2 ON t1.orgId = t2.orgId
         LEFT JOIN (
                 SELECT
@@ -75,9 +94,9 @@
                     oi.org_name orgName,
                     bri.plan_number outPlanNumber,
                     bri.plan_year planYear,
-                    bro.plan_quantity,
-                    bro.sealing_quantity,
-                    bfcs.standard_value
+                    SUM(bro.plan_quantity) plan_quantity,
+                    SUM(bro.sealing_quantity) sealing_quantity,
+                    SUM(bfcs.standard_value) standard_value
                 FROM
                     biz_rp_issuance bri
                 INNER JOIN depot_qh.business_rp_report brr ON bri.rp_report_id = brr.id
@@ -90,16 +109,18 @@
                 AND brr.rotation_year = YEAR (NOW())
                 AND bri.plan_year = YEAR (NOW())
                 AND bfcs.standard_type = 1
+                GROUP BY
+		          bro.org_id
         ) t3 ON t1.orgId = t2.orgId AND t2.orgId = t3.orgId
         LEFT JOIN (
             SELECT
                 brin.org_id orgId,
                 oi.org_name orgName,
                 bri.plan_number inPlanNumber,
-                bfcs.standard_value,
+                SUM(bfcs.standard_value) standard_value,
                 bri.plan_year planYear,
-                brin.plan_quantity,
-                brin.quantity
+                SUM(brin.plan_quantity) plan_quantity,
+		        SUM(brin.quantity) quantity
             FROM
                 biz_rp_issuance bri
             INNER JOIN depot_qh.business_rp_report brr ON bri.rp_report_id = brr.id
@@ -112,6 +133,30 @@
             AND brr.rotation_year = YEAR (NOW())
             AND bri.plan_year = YEAR (NOW())
             AND bfcs.standard_type = 1
-        ) t4 ON t3.orgId = t4.orgId
+            GROUP BY
+		      brin.org_id
+        ) t4 ON t1.orgId = t4.orgId
+        LEFT JOIN (
+            SELECT
+                gp.id,
+                gp.org_id,
+                gp.plan_quantity processedGrainPlanQuantity,
+                (
+                    gp.completion_quantity / gp.plan_quantity
+                ) * 100 processedGrainCompletionRate,
+                cs.standard_value processedGrainCostStandard,
+                (
+                    gp.plan_quantity * cs.standard_value
+                ) processedGrainSubsidy,
+                '0' otherSubsidy
+            FROM
+                depot_qh.business_pg_gops_plan gp
+            LEFT JOIN depot_qh.business_fs_cost_standard cs ON gp.org_id = cs.org_id
+            WHERE
+                gp.plan_type = 1
+            AND cs.standard_type = 1
+            GROUP BY
+                cs.org_id
+        ) t5 ON t1.orgId = t5.org_id
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/rotationCostSubsidySettle/service/impl/RotationCostSubsidySettleServiceImpl.java

@@ -108,6 +108,7 @@ public class RotationCostSubsidySettleServiceImpl extends ServiceImpl<RotationCo
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void taskAction() {
         List<RotationCostSubsidySettle> chaosData = rotationCostSubsidySettleMapper.selectChaosData();
         if (CollectionUtils.isNotEmpty(chaosData)) {