同步产权人&修改大中型提成计算查询

biz-base/src/main/java/com/dayou/controller/DyoaController.java

@@ -174,4 +174,11 @@ public class DyoaController {
         Boolean ret = dyoaHistoryService.commissionProductionId();
         return RestResponse.data(ret);
     }
+
+    @IgnoreAuth
+    @GetMapping("/update/majorOrder/owner")
+    public RestResponse<Boolean> majorOrderOwner(){
+        Boolean ret = dyoaHistoryService.majorOrderOwner();
+        return RestResponse.data(ret);
+    }
 }

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -857,8 +857,6 @@
         WHERE
         deleted = 0
         AND production_fund_id IS NOT NULL
-        AND claim_datetime >= #{vo.startDate}
-        AND claim_datetime  <= #{vo.endDate}
         ) fc
         INNER JOIN ( SELECT id, order_fund_id, business_id, production_no FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) pf ON ( pf.id = fc.production_fund_id AND pf.order_fund_id = fc.order_fund_id )
         INNER JOIN (
@@ -889,8 +887,12 @@
         ) mpa ON ( mpa.major_id = m.id AND cd.id = mpa.declare_id AND (mpa.major_production_id is null or mpa.major_production_id = mp.id ))
         LEFT JOIN user u ON u.id = mpa.user_id
         <where>
+            (select IF
+            ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date )) &gt;= #{vo.startDate}
+            AND  (select IF
+            ( fc.claim_datetime > mp.delivery_date, fc.claim_datetime, mp.delivery_date )) &lt;= #{vo.endDate}
             <if test="vo!=null and vo.userIds!=null and vo.userIds.size!=0">
-                mpa.user_id in
+               and  mpa.user_id in
                 <foreach collection="vo.userIds" open="(" close=")" separator="," item="userId">
                     #{userId}
                 </foreach>

domain/src/main/java/com/dayou/vo/AssetsProdOverdueVO.java

@@ -4,6 +4,7 @@ import com.dayou.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.Set;
 
@@ -52,8 +53,8 @@ public class AssetsProdOverdueVO {
     @Excel(name = "标准收费")
     private BigDecimal standardAmount;
 
-    @Excel(name = "出库时间" ,dateFormat="yyyy-MM-dd HH:mm:ss")
-    private Date repertoryOutTime;
+    @Excel(name = "出库时间")
+    private LocalDate repertoryOutTime;
 
 
     private Integer overdueMin;

domain/src/main/java/com/dayou/vo/MajorProdOverdueVO.java

@@ -4,6 +4,7 @@ import com.dayou.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -59,8 +60,8 @@ public class MajorProdOverdueVO {
     @Excel(name = "收费标准")
     private BigDecimal standardAmount;
 
-    @Excel(name = "出库时间" ,dateFormat="yyyy-MM-dd HH:mm:ss")
-    private Date repertoryOutTime;
+    @Excel(name = "出库时间")
+    private LocalDate repertoryOutTime;
 
 
     private Integer overdueMin;

domain/src/main/java/com/dayou/vo/PersonalOverdueVO.java

@@ -4,6 +4,7 @@ import com.dayou.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.Set;
 
@@ -24,7 +25,7 @@ public class PersonalOverdueVO{
     @Excel(name = "面积")
     private BigDecimal acreage;
 
-    @Excel(name = "单机")
+    @Excel(name = "单价")
     private BigDecimal price;
 
     @Excel(name = "总价")
@@ -64,7 +65,7 @@ public class PersonalOverdueVO{
     private String pricingStaffName;
 
     @Excel(name = "出库日期")
-    private Date rot;
+    private LocalDate rot;
 
     private Integer overdueMin;
 

service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -2250,6 +2250,20 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         return null;
     }
 
+    @Override
+    public Boolean majorOrderOwner() {
+        List<Major> majors = majorServiceImpl.list(new LambdaQueryWrapper<Major>().select(BaseEntity::getId).isNull(Major::getOwner).eq(BaseEntity::getDeleted, Boolean.FALSE));
+        for (Major major : majors){
+            List<MajorProduction> list = majorProductionService.list(new LambdaQueryWrapper<MajorProduction>()
+                    .eq(MajorProduction::getMajorId, major.getId()).eq(BaseEntity::getDeleted, Boolean.FALSE));
+            if (CollectionUtil.isNotEmpty(list)){
+                majorServiceImpl.update(new LambdaUpdateWrapper<Major>().eq(BaseEntity::getId,major.getId())
+                        .set(Major::getOwner,list.get(0).getOwner()));
+            }
+        }
+        return null;
+    }
+
 
     @Override
     public Boolean updateProductionFund() {

service/src/main/java/com/dayou/dyoa/IDyoaHistoryService.java

@@ -65,4 +65,6 @@ public interface IDyoaHistoryService {
     Boolean personalEntityInfo();
 
     Boolean commissionProductionId();
+
+    Boolean majorOrderOwner();
 }

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -183,7 +183,7 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
     public Boolean update(MajorProduction taskData) {
         String reportNo = taskData.getReportNo();
         Major major = majorService.getOne(new LambdaQueryWrapper<Major>().eq(BaseEntity::getId, taskData.getMajorId())
-                .select(BaseEntity::getId, Major::getEvaluateAim,Major::getBusinessObjectType));
+                .select(BaseEntity::getId, Major::getEvaluateAim,Major::getBusinessObjectType,Major::getOwner));
         taskData.setBusinessObjectType(major.getBusinessObjectType());
         checkingRule(taskData);
         List<MajorTarget> targets = null;
@@ -215,6 +215,12 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
             taskData.setProduction(REPORT.name());
         }
 
+        //更新订单的产权人信息
+        String owner = taskData.getOwner();
+        if (StrUtil.isNotBlank(owner)){
+            majorService.update(new LambdaUpdateWrapper<Major>().eq(BaseEntity::getId,major.getId())
+                    .set(Major::getOwner,owner));
+        }
         return  this.updateById(taskData);
     }