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

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -257,6 +257,26 @@ public class ReportController  {
         return reportService.getMacRecCurrentItemReport(param);
     }
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:19
+     */
+    @PostMapping("get_mac_pay_current_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacPayCurrentReport(param);
+    }
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:20
+     */
+    @PostMapping("get_mac_pay_current_item_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentItemReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacPayCurrentItemReport(param);
+    }
+
 }
 
 

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -245,4 +245,17 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
     List<Map<String, Object>> getMacRecCurrentItemReport(Map param);
 
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:37
+     */
+    List<Map<String, Object>> getMacPayCurrentReport(Map param);
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:37
+     */
+    List<Map<String, Object>> getMacPayCurrentItemReport(Map param);
 }

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -543,7 +543,8 @@
     <!-- 采购明细报表主表 -->
     <select id="getPurReport" resultType="java.util.Map">
         select
-        tpp.pur_no as "purNo"
+        tpp.pur_id as "purId"
+        ,tpp.pur_no as "purNo"
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
@@ -593,7 +594,8 @@
     <!-- 采购明细报表明细 -->
     <select id="getPurDetailReport" resultType="java.util.Map">
         select
-        tpp.pur_no as "purNo"
+        tpp.pur_id as "purId"
+        ,tpp.pur_no as "purNo"
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
@@ -678,6 +680,7 @@
     <!-- 销售明细报表主表 -->
     <select id="getOrderReport" resultType="java.util.Map">
         SELECT
+        t.order_id as "orderId",
         t.order_no as "orderNo",
         sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "orderTypeName",
         tmo.org_name as "orgName",
@@ -734,7 +737,8 @@
     <!-- 销售明细报表明细 -->
     <select id="getOrderDetailReport" resultType="java.util.Map">
         select
-        t.order_no as "orderNo"
+        t.order_id as "orderId"
+        ,t.order_no as "orderNo"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "orderTypeName"
         ,tmo.org_name as "orgName"
         ,tms.staff_name as "staffName"
@@ -2654,4 +2658,15 @@
                    ,#{accDateEnd} ::date,#{i18n} ,#{currentPage},#{pageSize})
     </select>
 
+    <!-- 客户往来账 -->
+    <select id="getMacPayCurrentReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_pay_current(#{cpId},#{currentPage},#{pageSize}, #{querys, typeHandler=JsonTypeHandler})
+    </select>
+
+    <!-- 客户往来账明细 -->
+    <select id="getMacPayCurrentItemReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_pay_current_item(#{cpId},#{objectId} ::uuid,#{orgId} ::uuid,#{macType},#{accDateStart} ::date
+                   ,#{accDateEnd} ::date,#{i18n} ,#{currentPage},#{pageSize})
+    </select>
+
 </mapper>

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

@@ -535,9 +535,26 @@ public class StaffService extends BaseService<Staff> {
         // 查询原来的getFlgCanLogin
         StaffResponse staffResponseOld = staffMapper.selectById(staffVO.getStaffId());
 
-        super.updateByUuid(staff);
         // 获取当前公司的cpId
         Integer cpId = authUtils.getStaff().getCpId();
+        // 校验同一个公司的电话不能重复
+        StaffQuery staffQuery = new StaffQuery();
+        staffQuery.setStaffPhone(staff.getStaffPhone());
+        staffQuery.setCpId(cpId);
+        List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
+        if (staffResponses != null && staffResponses.size() > 0 && !staffVO.getStaffId().equals(staffResponses.get(0).getStaffId())) {
+            return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
+        }
+
+        staffQuery.setStaffPhone(null);
+        staffQuery.setStaffCode(staff.getStaffCode());
+        staffResponses = staffMapper.selectByCondByCode(staffQuery);
+        if (staffResponses != null && staffResponses.size() > 0 && !staffVO.getStaffId().equals(staffResponses.get(0).getStaffId())) {
+            return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_CODE_EXIST);
+        }
+
+        super.updateByUuid(staff);
+
         //可以绑定微信的员工人数  人数上限
         if (staffVO.getFlgCanLogin()) {
             ResponseResultVO<?> resultMaxnum = companyFeign.getCompanyMaxStaffNum(cpId);
@@ -550,10 +567,10 @@ public class StaffService extends BaseService<Staff> {
                     Map<String, Object> mp = (Map<String, Object>) resultMaxnum.getData();
                     int intWebMaxnum = Integer.parseInt(mp.get("web_max_num") + "");
                     int intWxMaxnum = Integer.parseInt(mp.get("wx_max_num") + "");
-                    StaffQuery staffQuery = new StaffQuery();
-                    staffQuery.setFlgCanLogin(true);
-                    staffQuery.setCpId(cpId);
-                    List<StaffResponse> staffResponsesFlgCanLogin = staffMapper.selectByCond(staffQuery);
+                    StaffQuery staffQueryf = new StaffQuery();
+                    staffQueryf.setFlgCanLogin(true);
+                    staffQueryf.setCpId(cpId);
+                    List<StaffResponse> staffResponsesFlgCanLogin = staffMapper.selectByCond(staffQueryf);
                     if (staffResponsesFlgCanLogin != null && staffResponsesFlgCanLogin.size() > 0 ) {
                         List<StaffResponse> collectPc = staffResponsesFlgCanLogin.stream().filter(it -> it.getLoginType() == 1 || it.getLoginType() == 3).collect(Collectors.toList());
                         List<StaffResponse> collectWx = staffResponsesFlgCanLogin.stream().filter(it -> it.getLoginType() == 2 || it.getLoginType() == 3).collect(Collectors.toList());

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -565,5 +565,63 @@ public class ReportService {
         }
     }
 
+    /**
+     * @desc   : 供应商往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentReport(Map<String, Object> param) {
+        if (param.get("querys") != null) {
+            JSONObject querys = JSONObject.parseObject(param.get("querys").toString());
+            param.put("querys",querys);
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacPayCurrentReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_pay_current").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
+    /**
+     * @desc   : 供应商往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacPayCurrentItemReport(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacPayCurrentItemReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_pay_current_item").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
 
 }