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

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

@@ -37,6 +37,16 @@ public class OrgController{
     public ResponseResultVO<PageList<OrgResponse>> selectByCond(@RequestBody OrgQuery orgQuery) {
         return orgService.selectByCond(orgQuery);
     }
+    /**
+     * @desc   : 条件查询
+     * @author : 王英杰
+     * @date   : 2024/2/26 14:02
+     */
+    @ApiOperation( value = "分页、关联、条件查询", notes = "分页、关联、条件查询" )
+    @PostMapping({"list_by_tree"})
+    public ResponseResultVO<PageList<OrgResponse>> selectByCondTree(@RequestBody OrgQuery orgQuery) {
+        return orgService.selectByCondTree(orgQuery);
+    }
 
    /**
        * @desc   : 新建组织部门

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

@@ -197,8 +197,11 @@ public class StaffController {
      * @date : 2023-11-02 16:27
      */
     @PostMapping({"/feign_get_experience"})
-    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody StaffQuery staffQuery) {
-        log.info("feign_get_experience1" + staffQuery.toString());
+    ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> map) {
+        log.info("feign_get_experience1" + map.toString());
+        StaffQuery staffQuery = new StaffQuery();
+        staffQuery.setCpId(Integer.parseInt(map.get("cpId").toString()));
+        staffQuery.setStaffCode(map.get("staffCode").toString());
         ResponseResultVO<PageList<StaffResponse>> pageListResponseResultVO = staffService.selectByCond(staffQuery);
         log.info("feign_get_experience2" + pageListResponseResultVO.toString());
         return ResponseResultUtil.success(pageListResponseResultVO.getData().getList().get(0));
@@ -214,7 +217,7 @@ public class StaffController {
             notes = "登录后获取信息"
     )
     @PostMapping("get_info_after_login")
-    public ResponseResultVO<Dictionary<String,Object>> getInfoAfterLogin(@RequestBody Map<String, Object> param) {
+    public ResponseResultVO<Dictionary<String, Object>> getInfoAfterLogin(@RequestBody Map<String, Object> param) {
         return staffService.getInfoAfterLogin(param);
     }
 

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

@@ -183,6 +183,12 @@
             OR  t.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')
             )
         </if>
+        <if test="staffName != null and staffName != ''">
+            AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+        </if>
+        <if test="orgName != null and orgName != ''">
+            AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
     </sql>
 
     <sql id="idsForeach">

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

@@ -21,6 +21,12 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/10 17:20
      */
     List<OrgResponse> selectByCond(OrgQuery orgQuery);
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 姜宁
+     * @date   : 2023/1/10 17:20
+     */
+    List<OrgResponse> selectByCondTree(OrgQuery orgQuery);
 
     /**
      * @desc   : 根据条件进行查询

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

@@ -46,6 +46,62 @@
                 orgWh.org_id = parent.org_id
                 ) AS "whName"
     </sql>
+    <sql id="Base_Column_List_viewp">
+        tparent.org_id
+        ,tparent.org_name
+                ,tparent.parent_id
+                ,tparent.display_no
+                ,tparent.top_id
+                ,tparent.level_upper
+                ,tparent.level_lower
+                ,tparent.level_leaf
+                ,tparent.level_no
+                ,tparent.level_code
+                ,tparent.level_name
+                ,tparent.remarks
+                ,tparent.flg_valid
+                ,tparent.cp_id
+                         ,
+                (
+                SELECT
+                string_agg ( ma.mac_name, ',' )
+                FROM
+                dkic_b.t_mst_org_mac AS orgMac
+                left join dkic_b.t_mst_money_account ma on orgMac.mac_id=ma.mac_id
+                WHERE
+                orgMac.org_id = tparent.org_id
+                ) AS "orgMac"
+          ,
+                (
+                SELECT
+                string_agg ( wh.wh_name, ',' )
+                FROM
+                dkic_b.t_mst_org_wh AS orgWh
+                left join dkic_b.t_mst_warehouse wh on wh.wh_id=orgWh.wh_id
+                WHERE
+                orgWh.org_id = tparent.org_id
+                ) AS "whName"
+    </sql>
+    <sql id="Base_Column_List_viewT">
+        T.org_id
+        ,T.org_name
+                ,T.parent_id
+                ,T.display_no
+                ,T.top_id
+                ,T.level_upper
+                ,T.level_lower
+                ,T.level_leaf
+                ,T.level_no
+                ,T.level_code
+                ,T.level_name
+                ,T.remarks
+                ,T.flg_valid
+                ,T.cp_id
+                         ,
+             T.orgMac
+          ,
+              T.whName
+    </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.Org">
@@ -122,6 +178,9 @@
             <if test="flgValidList != null and flgValidList.size>0">
                 AND parent.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
+            <if test="flgValid != null">
+                AND flg_valid = #{flgValid}
+            </if>
             <if test="cpId != null">
                 AND parent.cp_id = #{cpId}
             </if>
@@ -149,7 +208,26 @@
         dkic_b.t_mst_org AS parent
         <include refid="Condition"/>
     </select>
-
+    <!-- 查询表t_mst_org，（条件查询+分页）列表 -->
+    <select id="selectByCondTree" resultMap="BaseResultMapResponse">
+        SELECT    <include refid="Base_Column_List_viewT"/>
+        FROM
+        (--当前数据
+        SELECT
+        <include refid="Base_Column_List_view"/>
+        FROM
+        dkic_b.t_mst_org AS parent
+        <include refid="Condition"/> UNION ALL
+        SELECT
+        <include refid="Base_Column_List_viewp"/>
+        FROM
+        dkic_b.t_mst_org AS parent
+        LEFT JOIN   dkic_b.t_mst_org AS tparent   ON parent.org_id = ANY ( tparent.level_lower )
+        <include refid="Condition"/>
+        ) T
+        GROUP BY
+        <include refid="Base_Column_List_viewT"/>
+    </select>
     <select id="resetLevelOrg" resultType="java.lang.Boolean">
         select dkic_b.f_reset_level_org(#{cpId}, #{topId}::uuid)
     </select>

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

@@ -166,7 +166,7 @@
         AND tmow.org_id = T.org_id
         AND tmow.flg_default
         LEFT JOIN dkic_b.t_mst_warehouse tmw ON tmw.wh_id = tmow.wh_id
-        WHERE t.wx_user_id = #{userId}::uuid
+        WHERE t.wx_user_id = #{id}::uuid
         AND t.cp_id = #{cpId}
     </select>
 

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -393,8 +393,8 @@
                 AND tpp.make_time = #{makeTime}
             </if>
             <if test="makeTimeStart != null and makeTimeEnd != null">
-                AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
-                AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+                AND tpp.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpp.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
             <if test="flgValid != null">
                 AND tpp.flg_valid = #{flgValid}

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -265,6 +265,12 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String supName;
 
+    @ApiModelProperty(value = "部门名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)

src/main/java/com/dk/mdm/service/mac/ReceiptService.java

@@ -116,6 +116,28 @@ public class ReceiptService extends BaseService<RecPay> {
      * @date : 2024-02-28 13:25
      */
     @Pagination
+    public ResponseResultVO selectById(String id) {
+        Map<String, Object> result = new HashMap<>();
+        RecPayResponse recPayResponse = recPayMapper.selectById(id);
+        result.put("data", recPayResponse);
+        // 收款明细
+        List<RecPayItemResponse> recPayItem = recPayItemMapper.selectByCond(new RecPayItemQuery().setRpId(id));
+        result.put("recPayItem", recPayItem);
+
+        // 应收核销明细
+        List<RecPayHandleItemResponse> recPayHandleItem = recPayHandleItemMapper.selectByCond(new RecPayHandleItemQuery().setRpId(id));
+        result.put("recPayHandleItem", recPayHandleItem);
+
+        // 附件
+        return ResponseResultUtil.success(result);
+    }
+
+    /**
+     * @desc : 查询收款明细
+     * @author : 付斌
+     * @date : 2024-02-28 13:25
+     */
+    @Pagination
     public ResponseResultVO<Map<String, Object>> selectRpInfoById(String id) {
         Map<String, Object> result = new HashMap<>();
         // 收款明细

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

@@ -78,6 +78,26 @@ public class OrgService extends BaseService<Org> {
                 orgMapper.countByCond(orgQuery));
     }
     /**
+     * @desc : 条件查询
+     * @author : 王英杰
+     * @date : 2023/1/10 17:19
+     */
+    @Pagination
+    public ResponseResultVO<PageList<OrgResponse>> selectByCondTree(OrgQuery orgQuery) {
+        List<OrgResponse> list = new ArrayList<>();
+        list = orgMapper.selectByCondTree(orgQuery);
+        if (orgQuery.getParentId() != null) { //说明传这个id就是部门档案查三级部门以下有没有子级
+            for (OrgResponse item : list) {
+                OrgQuery qry = new OrgQuery();
+                qry.setParentId( item.getOrgId());
+                item.setItemDataLength(orgMapper.countByCond(qry));
+            }
+        }
+        return super.mergeListWithCount(orgQuery, list,
+                orgMapper.countByCond(orgQuery));
+    }
+
+    /**
      * @desc   : 条件查询
      * @author : 宋扬
      * @date   : 2023/2/29 10:40