更新大中型业务来源id&我的订单显示评估信息

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

@@ -117,4 +117,11 @@ public class DyoaController {
         Boolean ret = dyoaHistoryService.updatePersonalProductionTime();
         return RestResponse.data(ret);
     }
+
+    @IgnoreAuth
+    @GetMapping("/update/majorSubClientId")
+    public RestResponse<Boolean> updateMajorSubClientId(){
+        Boolean ret = dyoaHistoryService.updateMajorSubClientId();
+        return RestResponse.data(ret);
+    }
 }

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

@@ -149,5 +149,14 @@ public class MajorController extends BaseController {
         Boolean ret =majorService.doRecall(id);
         return RestResponse.data(ret);
     }
+
+    /**
+     * 大中型产品详情
+     */
+    @GetMapping("/{id}/{productionNo}")
+    public RestResponse<MajorVO> productionDetail(@PathVariable Long id,@PathVariable("productionNo") String productionNo) throws InterruptedException {
+        MajorVO xMajor =majorService.productionDetail(id,productionNo);
+        return RestResponse.data(xMajor);
+    }
 }
 

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

@@ -59,4 +59,6 @@ public interface DyoaHistoryMapper {
 
     Date findCommissionDeclareDate(@Param("id") String id);
 
+
+
 }

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

@@ -2,11 +2,14 @@ package com.dayou.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.MajorStaticsDTO;
+import com.dayou.dto.MajorSubClientDTO;
 import com.dayou.entity.Major;
 import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.MajorVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 大中型项目 Mapper 接口
@@ -24,4 +27,8 @@ public interface MajorMapper extends CustomBaseMapper<Major> {
     MajorStaticsDTO staticsInformation(@Param("userId") Long userId);
 
     Page<MajorVO> xPage(Page page, @Param("major") MajorVO major,@Param("keyword") String keyword ,@Param("currentUserId") Long currentUserId);
+
+    List<MajorSubClientDTO> findMajorSubClient();
+
+    MajorVO productionDetail(@Param("id")Long id, @Param("productionNo") String productionNo);
 }

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

@@ -407,4 +407,87 @@
         </if>
         order by wfni.currentNodeId DESC
     </select>
+
+    <select id="findMajorSubClient" resultType="com.dayou.dto.MajorSubClientDTO">
+        SELECT
+            m.id,
+
+            m.clientele_sub_id,
+
+            (select id from customer_company where deleted = 0 and parent_id = m.clientele_id and name = cc.NAME limit 1) as realSubId
+        FROM
+            major m
+            LEFT JOIN customer_company cc ON (m.clientele_sub_id = cc.id )
+        WHERE
+            m.deleted = 0 and cc.level = 1
+    </select>
+
+    <select id="productionDetail" resultType="com.dayou.vo.MajorVO">
+        SELECT
+            m.id,
+            mp.report_no as productionNo,
+            mp.evaluate_acreage,
+            mp.evaluate_amount/10000 as evaluateAmount,
+            m.created,
+            m.NAME,
+            m.order_id,
+            m.financial,
+            m.allot_type,
+            m.client_manager_id,
+            m.principal_id,
+            m.department_id,
+            m.business_object_type,
+            m.special_type,
+            m.business_gener,
+            m.evaluate_aim,
+            m.entrust_again,
+            m.multiple_removal,
+            m.informal_evaluate,
+            m.clientele_type,
+            m.clientele_id,
+            m.clientele_sub_id,
+            m.clientele_contact_id,
+            m.dispense_benefit,
+            m.nonnative,
+            m.refinance,
+            m.loan_limit,
+            m.loan_period,
+            m.loan_nature,
+            m.loan_aim,
+            m.loan_expire,
+            m.bailor,
+            m.bailor_address,
+            m.bailor_contact_name,
+            m.bailor_contact_tel,
+            m.OWNER,
+            m.owner_tel,
+            m.urgent,
+            m.terminal_clientele_id,
+            m.terminal_clientele_type,
+            m.terminal_clientele_contact_id,
+            m.remark,
+            m.members,
+            m.feedback_info,
+            u.NAME AS clientManager ,
+            cc1.name as cClienteleName,
+            cc2.name as cClienteleSubName,
+            cl1.name as cClienteleContactName,
+            cl1.mobile as cMobile,
+            cl1.department as cDepartment,
+            cl1.duty as cDuty,
+            cc3.name as tTerminalClienteleName,
+            cc3.phone as tCompanyMobile,
+            cl2.name as tTerminalClienteleContactName,
+            cl2.mobile as tMobile
+        FROM
+            major m
+                LEFT JOIN user u ON u.id = m.client_manager_id
+                left join (select major_id,report_no, evaluate_acreage,evaluate_amount from major_production where major_id = #{id} and report_no = #{productionNo} and deleted=0) mp on mp.major_id = m.id
+                left join customer_company cc1 on cc1.id = m.clientele_id
+                left join customer_company cc2 on cc2.id = m.clientele_sub_id
+                left join customer_linkman cl1 on cl1.id = m.clientele_contact_id
+                left join customer_company cc3 on cc3.id = m.terminal_clientele_id
+                left join customer_linkman cl2 on cl2.id = m.terminal_clientele_contact_id where m.id =#{id}
+
+    </select>
 </mapper>

domain/src/main/java/com/dayou/dto/MajorSubClientDTO.java

@@ -0,0 +1,13 @@
+package com.dayou.dto;
+
+import lombok.Data;
+
+@Data
+public class MajorSubClientDTO {
+
+    private Long id;
+
+    private Long clienteleSubId;
+
+    private Long realSubId;
+}

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

@@ -110,6 +110,8 @@ public class MajorVO extends Major {
 
     private String productionName;
 
+    private String productionNo;
+
     private String reportNo;
 
     private String statementNo;
@@ -117,6 +119,7 @@ public class MajorVO extends Major {
     private String clientName;
     private String clientTel;
     private String evaluateAmount;
+    private String evaluateAcreage;
     private String owner;
     private String nodeCode;
     private Long currentNodeId;

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.common.BaseEntity;
 import com.dayou.common.PullDownModel;
+import com.dayou.dto.MajorSubClientDTO;
 import com.dayou.dto.PersonalProductionDTO;
 import com.dayou.dto.history.*;
 import com.dayou.entity.*;
@@ -1907,6 +1908,21 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
     }
 
 
+
+    @Override
+    public Boolean updateMajorSubClientId() {
+        List<MajorSubClientDTO> list = majorServiceImpl.findMajorSubClient();
+        for (MajorSubClientDTO majorSubClientDTO : list){
+            if (majorSubClientDTO.getRealSubId()!=null && !majorSubClientDTO.getRealSubId().equals(majorSubClientDTO.getClienteleSubId())){
+                majorServiceImpl.update(new LambdaUpdateWrapper<Major>()
+                        .eq(BaseEntity::getId,majorSubClientDTO.getId())
+                        .set(Major::getClienteleSubId,majorSubClientDTO.getRealSubId()));
+            }
+        }
+        return true;
+    }
+
+
     @Override
     public Boolean updateProductionFund() {
         List<OrderFund> orderFunds = orderFundService.getAllOrderFund();

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

@@ -49,4 +49,6 @@ public interface IDyoaHistoryService {
     Boolean updateAssetsProduction();
 
     Boolean updatePersonalProductionTime();
+
+    Boolean updateMajorSubClientId();
 }

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

@@ -1,13 +1,12 @@
 package com.dayou.service;
-import com.dayou.dto.MajorStaticsDTO;
-import com.dayou.dto.PriceFeedbackDTO;
-import com.dayou.dto.TaskRecordDTO;
-import com.dayou.dto.WorkNodeCommit;
+import com.dayou.dto.*;
 import com.dayou.entity.Major;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.vo.MajorVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 大中型项目 服务类
@@ -38,4 +37,8 @@ public interface IMajorService extends IService<Major> {
     Page<MajorVO> xPage(Page page, MajorVO major, String keyword);
 
     Boolean doRecall(Long id);
+
+    List<MajorSubClientDTO> findMajorSubClient();
+
+    MajorVO productionDetail(Long id, String productionNo);
 }

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

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -202,6 +203,16 @@ public class MajorServiceImpl extends ServiceImpl<MajorMapper, Major> implements
         }
     }
 
+    @Override
+    public List<MajorSubClientDTO> findMajorSubClient() {
+        return majorMapper.findMajorSubClient();
+    }
+
+    @Override
+    public MajorVO productionDetail(Long id, String productionNo) {
+        return majorMapper.productionDetail(id,productionNo);
+    }
+
 //    /**
 //     * 大中型业务下单
 //     * @param businessId