1.掌柜结算跟单月份调整

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -628,7 +628,7 @@ public class InsPlyIncomeController extends BaseController {
      * @param insPlyIncomeVo
      */
     @PostMapping("/correctData")
-    @ApiOperation(value = "批量保险非车修改比例确认")
+    @ApiOperation(value = "纠正数据")
     public HttpResult<Object> correctData(@RequestBody InsPlyIncomeVo insPlyIncomeVo) {
         insPlyIncomeService.correctData(insPlyIncomeVo);
         return HttpResult.ok();

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1946,6 +1946,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
      */
 
     @Override
+
     public List<InsPlyIncome> totalBxAmount(InsPlyIncomeVo insPlyIncomeVo) {
         HashMap<String, Object> params = new HashMap<>();
         params = this.saveParams(insPlyIncomeVo, params);
@@ -2610,10 +2611,15 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         InsPlyIncome totalledAmount = baseMapper.ptTotalAmount(params);  //总金额
         return totalledAmount;
     }
-
+// -> 2024
     @Override
     public HttpResult<List<HashMap<String, Object>>> otherTimeDetail(InsPlyIncomeVo insPlyIncomeVo) {
         HashMap<String, Object> params = new HashMap<>();
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getYeartsStart())){
+            params.put("year", insPlyIncomeVo.getYeartsStart());
+            params.put("yearAdd", String.valueOf((Integer.valueOf(insPlyIncomeVo.getYeartsStart())+1)));
+
+        }
         this.saveParams(insPlyIncomeVo, params);
         List<HashMap<String, Object>> resultMap = baseMapper.otherTimeDetail(params);
 

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -1794,7 +1794,7 @@
                FROM ins_ply_income a
                    LEFT JOIN ptl_agreement pa ON a.agreement_id = pa.id
                <where>
-                   YEAR(a.signdate) BETWEEN YEAR(CURDATE()) AND YEAR(CURDATE()) + 1
+                   YEAR(a.signdate) BETWEEN #{year} AND #{yearAdd}
                    <if test="startDate !=null  and  startDate!='' and  endDate !=null and endDate !=''">
                        and DATE_FORMAT( a.signdate, '%Y-%m-%d')  between DATE_FORMAT(#{startDate}, '%Y-%m-%d') and DATE_FORMAT(#{endDate}, '%Y-%m-%d')
                    </if>
@@ -1943,7 +1943,8 @@
               SUM(CASE WHEN a.settlement_status = '1' THEN IFNULL(a.settlement_amount, 0) ELSE 0 END) AS invoicCommissionFeevalue
           FROM settlement_documentary_fees a
           <where>
-              YEAR(a.signing_time) BETWEEN YEAR(CURDATE()) AND YEAR(CURDATE()) + 1
+              YEAR(a.signing_time) BETWEEN #{year} AND #{yearAdd}
+
               <if test="isNotCar !=null  and  isNotCar  !=''">
                   and a.is_not_car =#{isNotCar}
               </if>