子稽核员相关

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.CommonAPI;
 import org.jeecg.common.api.dto.message.MessageDTO;
 import org.jeecg.common.api.vo.Result;
@@ -332,7 +333,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @AutoLog(value = "客户信息-批量删除 子稽核员")
     @ApiOperation(value = "客户信息-批量删除子稽核员", notes = "客户信息-批量删除子稽核员")
     @DeleteMapping(value = "/deleteBatch/create/user")
-    @PermissionData(value = "truck/task/check/delete/person")
+    @RequiresPermissions("truck:task:check:list:delete:person")
     public Result<String> deleteBatchCreateUser(@RequestParam(name = "ids") String ids) {
 
         List<String> list = Arrays.asList(ids.split(","));

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.PermissionData;
@@ -162,7 +163,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     }
 
     /**
-     * 编辑（子稽核员）
+     * 编辑（子稽核员）开始
      *
      * @param smsCheckTask 对象
      * @return 结果
@@ -170,7 +171,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     @AutoLog(value = "稽核任务-编辑 子稽核员")
     @ApiOperation(value = "稽核任务-编辑 子稽核员", notes = "稽核任务-编辑 子稽核员")
     @RequestMapping(value = "/edit/create/user", method = {RequestMethod.PUT, RequestMethod.POST})
-    @PermissionData(value = "/truck/task/edit/person")
+    @RequiresPermissions("truck:task:list:start:person")
     public Result<String> editCreateUser(@RequestBody SmsCheckTask smsCheckTask) {
 
 
@@ -186,6 +187,32 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         return Result.OK("编辑成功!");
     }
 
+    /**
+     * 编辑（子稽核员）结束
+     *
+     * @param smsCheckTask 对象
+     * @return 结果
+     */
+    @AutoLog(value = "稽核任务-编辑 子稽核员")
+    @ApiOperation(value = "稽核任务-编辑 子稽核员", notes = "稽核任务-编辑 子稽核员")
+    @RequestMapping(value = "/editEnd/create/user", method = {RequestMethod.PUT, RequestMethod.POST})
+    @RequiresPermissions("truck:task:list:end:person")
+    public Result<String> editCreateUserEnd(@RequestBody SmsCheckTask smsCheckTask) {
+
+
+        SmsCheckTask byId = taskService.getById(smsCheckTask.getId());
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!byId.getCreateBy().equals(loginUser.getWorkNo())){
+            return Result.error("子稽核员不可操作非本人创建任务!");
+        }
+        this.taskService.update(new SmsCheckTask().setTaskState(smsCheckTask.getTaskState())
+                        .setDescription(smsCheckTask.getDescription())
+                        .setTaskStartTime(smsCheckTask.getTaskStartTime()).setTaskEndTime(smsCheckTask.getTaskEndTime()),
+                new UpdateWrapper<SmsCheckTask>().lambda().eq(SmsCheckTask::getId,smsCheckTask.getId()));
+        return Result.OK("编辑成功!");
+    }
+
+
     /**
      * 通过id删除
      *
@@ -197,6 +224,11 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id") String id) {
         boolean removeById = taskService.removeById(id);
+        SmsCheckTask byId = taskService.getById(id);
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!byId.getCreateBy().equals(loginUser.getWorkNo())){
+            return Result.error("子稽核员不可操作非本人创建任务!");
+        }
         if (removeById){
             LambdaQueryWrapper<SmsCheckCustomerInfo> smsCheckCustomerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smsCheckCustomerInfoLambdaQueryWrapper.eq(SmsCheckCustomerInfo::getTaskId,id);
@@ -207,6 +239,29 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         return Result.OK("删除成功!");
     }
 
+
+
+    /**
+     * 通过id删除 子稽核员
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    @AutoLog(value = "稽核任务-通过id删除")
+    @ApiOperation(value = "稽核任务-通过id删除", notes = "稽核任务-通过id删除")
+    @DeleteMapping(value = "/delete/user")
+    @RequiresPermissions("truck:task:list:delete:person")
+    public Result<String> deleteUser(@RequestParam(name = "id") String id) {
+        boolean removeById = taskService.removeById(id);
+        if (removeById){
+            LambdaQueryWrapper<SmsCheckCustomerInfo> smsCheckCustomerInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            smsCheckCustomerInfoLambdaQueryWrapper.eq(SmsCheckCustomerInfo::getTaskId,id);
+            SmsCheckCustomerInfo smsCheckCustomerInfo = new SmsCheckCustomerInfo();
+            smsCheckCustomerInfo.setDelFlag(1);
+            iSmsCheckCustomerInfoService.update(smsCheckCustomerInfo,smsCheckCustomerInfoLambdaQueryWrapper);
+        }
+        return Result.OK("删除成功!");
+    }
     /**
      * 批量删除
      *

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsTruckCustomerDataController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.checkerframework.checker.units.qual.A;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -292,7 +293,7 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
     @AutoLog(value = "客户资料Log 子稽核员-添加")
     @ApiOperation(value = "客户资料Log 子稽核员-添加", notes = "客户资料Log 子稽核员-添加")
     @PostMapping(value = "/addLog/create/user")
-    @PermissionData(value = "truck/task/check/audit/person")
+    @RequiresPermissions("truck:task:check:list:audit:person")
     public Result<String> addLogCreateUser(@RequestBody JSONObject jsonObject) throws IllegalAccessException {
 
         SmsTruckCheckCustomerDataAndLog smsTruckCheckCustomerDataAndLog = JSON.parseObject(jsonObject.toJSONString(), SmsTruckCheckCustomerDataAndLog.class);