Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -268,4 +268,15 @@ public class StaffController {
     public ResponseResultVO<?> deleteGhostStaff(@RequestBody StaffVO staffVO) {
         return staffService.deleteGhostStaff(staffVO);
     }
+
+    /**
+     * @desc   : 更新负责人标识
+     * @author : 刘尧
+     * @date   : 2024/6/21 16:24
+     */
+    @ApiOperation(value = "更新负责人标识", notes = "更新负责人标识")
+    @PostMapping({"update_flgInit"})
+    public ResponseResultVO updateFlgInit(@RequestBody Map<String, Object> params){
+        return staffService.updateFlgInit(params);
+    }
 }

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -589,8 +589,19 @@
         <include refid="Base_Column_List_Response"/>
         ,tpid.into_no as "intoNo"
         ,tmgs.sku_code  as "skuCode"
-        ,tmgs.sku_model as "skuModel"
-        ,tmgs.sku_name  as "skuName"
+
+        ,case when tmgs.sku_model is null then tpii.sku_model
+        when tmgs.sku_model is not null then tmgs.sku_model
+        else null end as "skuModel"
+        ,case when tmgs.sku_name is null then tpii.sku_name
+        when tmgs.sku_name is not null then tmgs.sku_name
+        else null end as "skuName"
+
+
+--         ,tmgs.sku_model as "skuModel"
+--         ,tmgs.sku_name  as "skuName"
+--         ,tpii.sku_model as "skuModel"
+--         ,tpii.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -70,6 +70,7 @@
             <result column="receipt_residue" property="receiptResidue"/>
             <result column="payable_residue" property="payableResidue"/>
             <result column="payment_residue" property="paymentResidue"/>
+            <result column="macNames" property="macNames"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -241,7 +242,8 @@
                t.flg_valid,
                t.cp_id,
                 tma.receivable_residue,
-                tma.receipt_residue
+                tma.receipt_residue,
+                 concat (tmma.mac_name ) AS "macNames"
         from dkic_b.t_mac_rec_pay as t
                  left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
@@ -249,7 +251,8 @@
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
                   LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
-
+                 left  join   dkic_b.t_mac_rec_pay_item  rpi  on  rpi.rp_id = t.rp_id
+                 left  join   dkic_b.t_mst_money_account tmma  on  tmma.mac_id = rpi.mac_id
         where t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
         <include refid="Condition"/>
 

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.java

@@ -67,5 +67,18 @@ public interface StaffMapper extends BaseMapper<Staff>{
      */
     int deleteGhostStaff(StaffQuery staffQuery);
 
+    /**
+     * @desc : 通过商户号注销当前负责人
+     * @author : 刘尧
+     * @date : 2024/6/21 10:21
+     */
+    boolean updateFlgInit(Map<String, Object> params);
+
+    /**
+     * @desc : 通过用户id更新负责人
+     * @author : 刘尧
+     * @date : 2024/6/21 10:43
+     */
+    boolean updateFlgInitById(String owner);
 }
 

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -257,4 +257,15 @@
           and cp_id = #{cpId}
           and flg_ghost = true
     </delete>
+
+    <!--根据商户号注销当前商户的负责人-->
+    <update id="updateFlgInit">
+        UPDATE dkic_b.t_mst_staff SET flg_init = false
+        WHERE cp_id = #{cpId}
+    </update>
+    <!--通过用户id更新负责人-->
+    <update id="updateFlgInitById">
+        UPDATE dkic_b.t_mst_staff SET flg_init = true
+        WHERE staff_id = #{userId}::uuid
+    </update>
 </mapper>

src/main/java/com/dk/mdm/model/response/mac/RecPayResponse.java

@@ -312,6 +312,9 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
     @ApiModelProperty(value = "资金账户编码")
     private String macCode;
 
+    @ApiModelProperty(value = "账户名称")
+    private String macNames;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -931,4 +931,18 @@ public class StaffService extends BaseService<Staff> {
             return ResponseResultUtil.error(-200,"绑定员工不存在");
         }
     }
+
+    /**
+     * @desc   : 更新负责人标识
+     * @author : 刘尧
+     * @date   : 2024/6/21 16:24
+     */
+    public ResponseResultVO updateFlgInit(Map<String, Object> params) {
+        boolean updateBool = staffMapper.updateFlgInit(params);
+        if (updateBool){
+            updateBool = staffMapper.updateFlgInitById(String.valueOf(params.get("owner")));
+            return ResponseResultUtil.success(updateBool);
+        }
+        return ResponseResultUtil.error();
+    }
 }