大中型标记送达 修改 & 个贷模版认领bug修改

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

@@ -324,6 +324,9 @@
         <result column="delivery" property="delivery" />
         <result column="mDeclareResult" property="mDeclareResult" />
         <result column="eDeclareResult" property="eDeclareResult" />
+        <result column="repertoryState" property="repertoryState" />
+        <result column="mDeclareResult" property="mDeclareResult" />
+        <result column="eDeclareResult" property="eDeclareResult" />
         <association property="currentNodeName" javaType="java.lang.String"
                      select="queryCurrentNodeName" column="{businessId=businessId,productionNo=productionNo}"/>
     </resultMap>
@@ -371,11 +374,12 @@
             pf.production_should_amount as shouldAmount,
             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
         FROM
             major m
-                left join (select id,name,major_id,report_no,evaluate_amount,production,if_save_file,delivery from major_production where deleted = 0 ) mp on mp.major_id = m.id
+                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
                 left join user u on u.id = m.principal_id
                 left join user u1 on u1.id = m.client_manager_id
                 left join customer_company cc on cc.id = m.clientele_id

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

@@ -29,7 +29,7 @@
     </update>
 
     <update id="updateRealAmountByOrderId">
-        update order_fund set real_amount = (ifnull(real_amount,0) + #{thisTimeAmount}) where order_id = #{orderId} and deleted = 0
+        update order_fund set real_amount = (ifnull(real_amount,0) + #{thisTimeAmount}) where order_id = #{orderId} and deleted = 0 and business_type = 'PERSONAL_BUSINESS'
     </update>
 
     <select id="residueNotAllotAmount" parameterType="java.lang.Long" resultType="java.math.BigDecimal">

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

@@ -148,6 +148,24 @@ public class MajorOrderVO {
     private BigDecimal orderRealAmount;
 
     /**
+     * 库存状态
+     */
+    @Excel(name = "库存状态")
+    private String repertoryState;
+
+    /**
+     * 市场人员申报提成
+     */
+    @Excel(name = "客户经理申报提成")
+    private String mDeclareResult;
+
+    /**
+     * 评估人员申报提成
+     */
+    @Excel(name = "评估人员申报提成")
+    private String eDeclareResult;
+
+    /**
      * 下单时间
      */
     @Excel(name = "下单时间")
@@ -162,15 +180,7 @@ public class MajorOrderVO {
 
     private String endDate;
 
-    /**
-     * 市场人员申报提成
-     */
-    private String mDeclareResult;
 
-    /**
-     * 评估人员申报提成
-     */
-    private String eDeclareResult;
 
     private String name;
 
@@ -195,4 +205,7 @@ public class MajorOrderVO {
      */
     private Boolean hasShouldAmount;
 
+
+
+
 }

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

@@ -1269,7 +1269,7 @@ public class PersonalProductionServiceImpl extends ServiceImpl<PersonalProductio
 
         }
 
-        if (StringUtils.isEmpty(usingInfo) ||  "空置".equals(usingInfo) || "自用".equals(usingInfo)) {
+        if (StringUtils.isEmpty(usingInfo) ||  "空置".equals(usingInfo) || "自用".equals(usingInfo) || "正常使用".equals(usingInfo)) {
             special += String.format("%s．根据权利人出具的“估价对象权利状况、法定优先受偿款调查说明及承诺书”，至价值时点，估价对象系%s房地产，未出租，本次估价以此为引用依据。上述事项我们未作进一步调查核实，请报告使用人予以特别关注。\r\n\t",
                     "\n" + index++, StrUtil.isEmpty(usingInfo)?"____":usingInfo);
         }