我的已认领改成我部门的已认领

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

@@ -89,6 +89,7 @@ public class DyoaController {
         return RestResponse.data(ret);
     }
 
+
     @IgnoreAuth
     @GetMapping("/update/majorCommission")
     public RestResponse<Boolean> updateMajorCommission(){

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

@@ -1,6 +1,7 @@
 package com.dayou.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.dayou.annotation.DataPermission;
 import com.dayou.annotation.IgnoreAuth;
 import com.dayou.dto.FinanceRealFundExportDTO;
 import com.dayou.dto.RealFundAssetsStatDTO;
@@ -30,6 +31,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import static com.dayou.common.Constants.FINANCE_DEPARTMENT;
+import static com.dayou.common.Constants.MANAGER_OFFICE;
+
 /**
  * 实收款认领
  *
@@ -194,6 +198,7 @@ public class FinanceClaimController extends BaseController {
      * @param page
      * @return
      */
+    @DataPermission(ignoreDepartment = {MANAGER_OFFICE,FINANCE_DEPARTMENT})
     @GetMapping("/page")
     public RestResponse<Page<FinanceClaimsVO>> financeClaimsList(FinanceClaimsVO financeClaimVO, Page page,String keyword){
         Page<FinanceClaimsVO> ret = financeClaimService.financeClaimsList(page,financeClaimVO,keyword);

dao/src/main/java/com/dayou/mapper/DyoaHistoryMapper.java

@@ -58,4 +58,5 @@ public interface DyoaHistoryMapper {
     List<CommissionRate> findScRate(@Param("id")String id);
 
     Date findCommissionDeclareDate(@Param("id") String id);
+
 }

dao/src/main/java/com/dayou/mapper/FinanceClaimMapper.java

@@ -59,5 +59,5 @@ public interface FinanceClaimMapper extends CustomBaseMapper<FinanceClaim> {
 
     List<FinanceClaimsVO> exportList(@Param("vo")FinanceClaimsVO financeClaimVO, @Param("keyword") String keyword);
 
-    List<HisClaimProd> updateClaimProductionId();
+    List<HisClaimProd> updateClaimProductionId(@Param("businessType") String businessType);
 }

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

@@ -490,4 +490,5 @@
     <select id="findCommissionDeclareDate" parameterType="java.lang.String" resultType="java.util.Date">
         select createdDatetime from wf_flow_instance where id = #{id}
     </select>
+
 </mapper>

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

@@ -424,6 +424,12 @@
         <if test="vo!=null and vo.claimUserId!=null and vo.claimUserId!=''">
             and fc.claim_user_id = #{vo.claimUserId}
         </if>
+        <if test="vo!=null and vo.userIds!=null and vo.userIds.size!=0">
+            and  fc.claim_user_id in
+            <foreach collection="vo.userIds" open="(" close=")" separator="," item="userId">
+                #{userId}
+            </foreach>
+        </if>
         order by fc.claim_datetime DESC
     </sql>
 
@@ -442,8 +448,8 @@
             fc.id AS fcid,
             fc.production_fund_id
         FROM
-            ( SELECT id, created FROM order_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) t
-                LEFT JOIN ( SELECT id, order_fund_id FROM production_fund WHERE business_type = 'MAJOR_BUSINESS' AND deleted = 0 ) p ON t.id = p.order_fund_id
+            ( SELECT id, created FROM order_fund WHERE business_type = #{businessType} AND deleted = 0 ) t
+                LEFT JOIN ( SELECT id, order_fund_id FROM production_fund WHERE business_type = #{businessType} AND deleted = 0 ) p ON t.id = p.order_fund_id
                 LEFT JOIN ( SELECT id, production_fund_id, order_fund_id FROM finance_claim WHERE deleted = 0 ) fc ON fc.order_fund_id = t.id
         WHERE
             fc.id IS NOT NULL  and p.id  is not null  and fc.production_fund_id is null

domain/src/main/java/com/dayou/dto/history/HisAssetsProduction.java

@@ -20,6 +20,7 @@ public class HisAssetsProduction {
     private BigDecimal money;
     private BigDecimal price;
     private Boolean finished;
+    private Date confirmTime;
     private Date archiveTime;
     private BigDecimal standardPrice;
     private BigDecimal needPay;

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.Set;
 
 @Data
 @ExcelSheet(sheetName = "认领记录")
@@ -69,5 +70,7 @@ public class FinanceClaimsVO {
      */
     private Long claimUserId;
 
+    private Set<Long> userIds;
+
 
 }

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

@@ -1800,11 +1800,16 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
 
     @Override
     public Boolean updateClaimProductionId() {
-        List<HisClaimProd> list = financeClaimService.updateClaimProductionId();
-        for (HisClaimProd hisClaimProd : list){
+        List<HisClaimProd> majorList = financeClaimService.updateClaimProductionId(MAJOR_BUSINESS.name());
+        for (HisClaimProd hisClaimProd : majorList){
+            financeClaimService.update(new LambdaUpdateWrapper<FinanceClaim>().eq(BaseEntity::getId,hisClaimProd.getFcid()).set(FinanceClaim::getProductionFundId,hisClaimProd.getPid()));
+        }
+        List<HisClaimProd> assetList = financeClaimService.updateClaimProductionId(ASSET_BUSINESS.name());
+        for (HisClaimProd hisClaimProd : assetList){
             financeClaimService.update(new LambdaUpdateWrapper<FinanceClaim>().eq(BaseEntity::getId,hisClaimProd.getFcid()).set(FinanceClaim::getProductionFundId,hisClaimProd.getPid()));
         }
         return true;
+
     }
 
     @Autowired

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

@@ -43,4 +43,5 @@ public interface IDyoaHistoryService {
     Boolean updateMajorProduction();
 
     Boolean updateCommissionDeclare();
+
 }

service/src/main/java/com/dayou/service/IFinanceClaimService.java

@@ -90,5 +90,5 @@ public interface IFinanceClaimService extends IService<FinanceClaim> {
 
     List<FinanceClaimsVO> exportList(FinanceClaimsVO financeClaimVO, String keyword);
 
-    List<HisClaimProd> updateClaimProductionId();
+    List<HisClaimProd> updateClaimProductionId(String businessType);
 }

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

@@ -257,8 +257,8 @@ public class FinanceClaimServiceImpl extends ServiceImpl<FinanceClaimMapper, Fin
     }
 
     @Override
-    public List<HisClaimProd> updateClaimProductionId() {
-        return financeClaimMapper.updateClaimProductionId();
+    public List<HisClaimProd> updateClaimProductionId(String businessType) {
+        return financeClaimMapper.updateClaimProductionId(businessType);
     }