三表一册

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java

@@ -304,7 +304,7 @@ public class PmProjectController extends BaseController {
      * 回单上传
      */
     // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list"))
-    @GetMapping("/updateProMonthTableRefund")
+    @PostMapping("/updateProMonthTableRefund")
     @SysLog(title = "三表一册", businessType = OperaType.UPDATE,  module = "三表一册->封档")
     public AjaxResult updateProMonthTableRefund(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) {
         try {
@@ -319,4 +319,20 @@ public class PmProjectController extends BaseController {
         }
         return error("系统异常,请联系管理员");
     }
+
+    /**
+     * 月度数据详情
+     */
+    // @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pro:month:list"))
+    @GetMapping("/getProMonthTableById")
+    @SysLog(title = "三表一册", businessType = OperaType.UPDATE,  module = "三表一册->月度数据详情")
+    public AjaxResult getProMonthTableById(@Validated @RequestBody ProMonthTable proMonthTable) {
+        try {
+            ProMonthTable res = pmProjectService.getProMonthTableById(proMonthTable);
+            return success(res);
+        } catch (Exception e) {
+            logger.error(e.toString(), e);
+        }
+        return error("系统异常,请联系管理员");
+    }
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/ProMonthTable.java

@@ -1,9 +1,11 @@
 package com.bonus.bmw.domain.vo;
 
+import com.bonus.system.api.model.UploadFileVo;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author 马三炮
@@ -116,4 +118,9 @@ public class ProMonthTable {
      * 封档人
      */
     private Integer updateUser;
+
+    /**
+     * 文件列表
+     */
+    List<UploadFileVo> contractFile;
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java

@@ -113,4 +113,9 @@ public interface PmProjectMapper {
      * 封档
      */
     int updateProMonthTable(ProMonthTable proMonthTable);
+
+    /**
+     * 月度数据详情
+     */
+    ProMonthTable getProMonthTableById(ProMonthTable proMonthTable);
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmProjectService.java

@@ -89,4 +89,9 @@ public interface PmProjectService {
      * 回单上传
      */
     int updateProMonthTableRefund(ProMonthTable proMonthTable, FileBasicMsgDto fileBasicMsgDto);
+
+    /**
+     * 月度数据详情
+     */
+    ProMonthTable getProMonthTableById(ProMonthTable proMonthTable);
 }

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java

@@ -246,4 +246,15 @@ public class PmProjectServiceImpl implements PmProjectService {
         }
         return res;
     }
+
+    /**
+     * 月度数据详情
+     */
+    @Override
+    public ProMonthTable getProMonthTableById(ProMonthTable proMonthTable) {
+        ProMonthTable res  =pmProjectMapper.getProMonthTableById(proMonthTable);
+        List<UploadFileVo> contractFile = fileUploadUtils.getFileList("", res.getId().toString(), Constants.TB_PRO_MONTH_TABLE, "");
+        res.setContractFile(contractFile);
+        return res;
+    }
 }

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml

@@ -261,11 +261,32 @@
         select id,month_id,pro_id,`month`,pro_name,month_day,roster_id,sub_id,sub_name,user_name,
                id_card,work_name,work_id,attendance_day,check_day,repair_num,attendance_num
         from tb_user_attendance where month_id = #{monthId}
+        <if test="subName != null">
+            and sub_name  LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="userName != null">
+            and user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
     </select>
     <select id="getUserWagePayList" resultType="com.bonus.bmw.domain.vo.UserWagePayVo">
         select id,pro_id,`month`,user_id,month_id,user_name,roster_id,id_card,team_id,team_name,work_name,
                attendance_num,pay_money,deduct_money,actual_money,bank_name,bank_num,bank_code,is_accord,
                signature,remark,pay_day,bank_number,create_time,update_time,update_user
         from tb_user_wage_pay where month_id = #{monthId}
+        <if test="bankCode != null">
+            and bank_code  LIKE CONCAT('%', #{bankCode}, '%')
+        </if>
+        <if test="teamName != null">
+            and team_name LIKE CONCAT('%', #{teamName}, '%')
+        </if>
+        <if test="userName != null">
+            and user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
+    </select>
+    <select id="getProMonthTableById" resultType="com.bonus.bmw.domain.vo.ProMonthTable">
+        select id,pro_id,table_month,roster_num,attendance_num,repair_num,salary_num,sub_num,
+               gross_salary,net_salary,status,block_time,refund_status,team_num,refund_user,
+               refund_time,is_update,pay_num
+        from tb_pro_month_table where id = #{id}
     </select>
 </mapper>