完善

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFeeDTO.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.*;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -22,7 +23,14 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class RepairFeeDTO extends BaseDTO implements Serializable {
-
+    /**
+     * 货币类型
+     */
+    private Integer moneyType;
+    /**
+     * 费用日期
+     */
+    private LocalDate date;
     /**
      * 主键
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairFee.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -68,7 +69,14 @@ public class RepairFee implements Serializable {
      * 更新人
      */
     private String updateUserId;
-
+    /**
+     * 货币类型
+     */
+    private Integer moneyType;
+    /**
+     * 费用日期
+     */
+    private LocalDate feeDate;
     /**
      * 创建人
      */
@@ -80,7 +88,7 @@ public class RepairFee implements Serializable {
     @Transient
     private String updateUserName;
     /**
-     * 维修单号
+     * 委外单号
      */
     @Transient
     private String repairNo;

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -10,6 +10,8 @@
         <result column="descripition" jdbcType="VARCHAR" property="descripition"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <result column="created_time" jdbcType="TIMESTAMP" property="createdTime"/>
+        <result column="fee_date" jdbcType="DATE" property="feeDate"/>
+        <result column="money_type" jdbcType="SMALLINT" property="moneyType"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="created_user_id" jdbcType="VARCHAR" property="createdUserId"/>
         <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
@@ -21,7 +23,9 @@
                      select="com.platform.dao.mapper.repair.RepairFormMapper.selectNoById"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, repair_id, fee, type, reason, descripition, remark, created_time, update_time,
+        id, repair_id, fee, type, reason,
+fee_date,money_type,
+descripition, remark, created_time, update_time,
         created_user_id, update_user_id
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairFeeDTO" resultMap="BaseResultMap">

platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -52,7 +52,7 @@ public class CheckJobController {
    */
   @SysLog("新增点检任务")
   @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-add') or @pms.hasPermission('check-polling-jobs-add')")
+  @PreAuthorize("@pms.hasPermission('check-polling-jobs-add')")
   public R save(@Validated({AddGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
       return new R<>(checkJobService.saveModelByDTO(checkJobDTO));
   }
@@ -79,7 +79,7 @@ public class CheckJobController {
    */
   @SysLog("删除点检任务")
   @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-del') or @pms.hasPermission('check-polling-jobs-del')")
+  @PreAuthorize("@pms.hasPermission('check-polling-jobs-del')")
   public R removeById(@PathVariable String id){
     checkJobService.deleteByPrimaryKey(id);
     return new R<>();
@@ -93,7 +93,7 @@ public class CheckJobController {
      */
     @SysLog("批量删除点检任务")
     @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-jobs-del') or @pms.hasPermission('check-polling-jobs-del')")
+    @PreAuthorize("@pms.hasPermission('check-polling-jobs-del')")
     public R removeIds(@RequestBody List<String> ids){
         checkJobService.batchDelete(ids);
         return new R<>();
@@ -153,7 +153,7 @@ public class CheckJobController {
      */
   @GetMapping("/export")
   @SysLog("任务导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-export') or @pms.hasPermission('check-polling-jobs-export')")
+  @PreAuthorize("@pms.hasPermission('check-polling-jobs-export')")
   public void export(HttpServletResponse response, CheckJobDTO checkJobDTO) {
     List<CheckJobVO> list = checkJobService.getVOListByDTO(checkJobDTO);
     ExcelUtil.exportResponseDict(response, ExportCheckJobVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckJobVO.class), "保养任务");
@@ -196,7 +196,7 @@ public class CheckJobController {
      */
     @SysLog("批量接收保养任务")
     @PutMapping("/batch/execute")
-    //@PreAuthorize("@pms.hasPermission('sb-infos-edit')")
+    @PreAuthorize("@pms.hasPermission('check-polling-jobs-edit')")
     public R batchExecute(@Validated({UpdateGroup.class}) @RequestBody List<String> ids) {
         checkJobService.executeJobBatch(ids);
         return new R<>("已接收");
@@ -210,7 +210,7 @@ public class CheckJobController {
      */
     @SysLog("批量完成保养任务")
     @PutMapping("/batch/finish")
-    //@PreAuthorize("@pms.hasPermission('sb-infos-edit')")
+    @PreAuthorize("@pms.hasPermission('check-polling-jobs-edit')")
     public R batchFinish(@Validated({UpdateGroup.class}) @RequestBody List<String> ids) {
         checkJobService.finishJobBatch(ids);
         return new R<>("已完成");