Merge remote-tracking branch 'origin/master'

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/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<>();
         // 收款明细