Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

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

@@ -375,8 +375,8 @@
             fi.invoiceAmount,
             mp.delivery,
             (case mp.repertory_state when 0 then '已入库' when 1 then '已出库' else '未入库' end ) repertoryState,
-            ( SELECT declare_result FROM commission_declare WHERE business_id = m.id AND production_id IS NULL AND business_type = 'COMMISSION_DECLARE_MAJOR_MARKET' AND deleted = 0 ) as mDeclareResult,
-            ( SELECT declare_result FROM commission_declare WHERE business_id = m.id AND production_id IS NULL AND business_type = 'COMMISSION_DECLARE_MAJOR_EVALUATE' AND deleted = 0 ) as eDeclareResult
+            ( SELECT declare_result FROM commission_declare WHERE business_id = m.id AND production_id IS NOT NULL AND business_type = 'COMMISSION_DECLARE_MAJOR_MARKET' AND deleted = 0 order by created desc limit 1 ) as mDeclareResult,
+            ( SELECT declare_result FROM commission_declare WHERE business_id = m.id AND production_id IS NOT NULL AND business_type = 'COMMISSION_DECLARE_MAJOR_EVALUATE' AND deleted = 0 order by created desc limit 1) as eDeclareResult
         FROM
             major m
                 left join (select id,name,major_id,report_no,evaluate_amount,production,if_save_file,delivery,repertory_state from major_production where deleted = 0 ) mp on mp.major_id = m.id

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

@@ -2109,19 +2109,19 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
         for (OrderFund orderFund : list){
             if (orderFund.getBusinessType().equals(PERSONAL_BUSINESS.name())){
                 Personal p = personalService.getOne(new LambdaQueryWrapper<Personal>().eq(BaseEntity::getId, orderFund.getBusinessId()).select(Personal::getClientManagerId, BaseEntity::getId));
-                if (p!=null){
+                if (p!=null && orderFund.getClientManagerId()==null){
                     orderFundService.update(new LambdaUpdateWrapper<OrderFund>().set(OrderFund::getClientManagerId,p.getClientManagerId()).eq(BaseEntity::getId,orderFund.getId()));
                 }
             }
             if (orderFund.getBusinessType().equals(MAJOR_BUSINESS.name())){
                 Major m = majorServiceImpl.getOne(new LambdaQueryWrapper<Major>().eq(BaseEntity::getId, orderFund.getBusinessId()).select(Major::getClientManagerId, BaseEntity::getId));
-                if (m!=null){
+                if (m!=null && orderFund.getClientManagerId()==null){
                     orderFundService.update(new LambdaUpdateWrapper<OrderFund>().set(OrderFund::getClientManagerId,m.getClientManagerId()).eq(BaseEntity::getId,orderFund.getId()));
                 }
             }
             if (orderFund.getBusinessType().equals(ASSET_BUSINESS.name())){
                 Assets a = assetsService.getOne(new LambdaQueryWrapper<Assets>().eq(BaseEntity::getId, orderFund.getBusinessId()).select(Assets::getClientManagerId, BaseEntity::getId));
-                if (a!=null){
+                if (a!=null && orderFund.getClientManagerId()==null){
                     orderFundService.update(new LambdaUpdateWrapper<OrderFund>().set(OrderFund::getClientManagerId,a.getClientManagerId()).eq(BaseEntity::getId,orderFund.getId()));
                 }
             }