|
@@ -8,12 +8,14 @@ import cn.hutool.core.lang.Assert;
|
|
import cn.hutool.core.map.MapUtil;
|
|
import cn.hutool.core.map.MapUtil;
|
|
import cn.hutool.core.util.IdcardUtil;
|
|
import cn.hutool.core.util.IdcardUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.google.zxing.WriterException;
|
|
import com.google.zxing.WriterException;
|
|
|
|
+import com.logosdata.security.Common;
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
@@ -38,6 +40,7 @@ import com.qunzhixinxi.hnqz.admin.util.GetOpenIDUtil;
|
|
import com.qunzhixinxi.hnqz.admin.util.Html2ImageByJsWrapper;
|
|
import com.qunzhixinxi.hnqz.admin.util.Html2ImageByJsWrapper;
|
|
import com.qunzhixinxi.hnqz.admin.util.QRCodeGenerator;
|
|
import com.qunzhixinxi.hnqz.admin.util.QRCodeGenerator;
|
|
import com.qunzhixinxi.hnqz.admin.view.user.UserUpdateInput;
|
|
import com.qunzhixinxi.hnqz.admin.view.user.UserUpdateInput;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
import com.qunzhixinxi.hnqz.common.ding.config.DingConfig;
|
|
import com.qunzhixinxi.hnqz.common.ding.config.DingConfig;
|
|
import com.qunzhixinxi.hnqz.common.ding.entity.EmployCheckResponse;
|
|
import com.qunzhixinxi.hnqz.common.ding.entity.EmployCheckResponse;
|
|
@@ -46,6 +49,7 @@ import com.qunzhixinxi.hnqz.common.ding.enums.DingEnum;
|
|
import com.qunzhixinxi.hnqz.common.ding.service.DingService;
|
|
import com.qunzhixinxi.hnqz.common.ding.service.DingService;
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
|
|
import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.config.TaxHelperConfig;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.config.TaxHelperConfig;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.model.TaxHelperAddMemberModel;
|
|
import com.qunzhixinxi.hnqz.common.taxhelper.entity.model.TaxHelperAddMemberModel;
|
|
@@ -805,9 +809,59 @@ public class ApiController {
|
|
@SysLog("新增任务内容表")
|
|
@SysLog("新增任务内容表")
|
|
@PostMapping("/saveTaskContent")
|
|
@PostMapping("/saveTaskContent")
|
|
public R saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
|
|
public R saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
|
|
- return wmTaskContentService.saveTaskContent(wmTaskContent);
|
|
|
|
|
|
+ R r = wmTaskContentService.saveTaskContent(wmTaskContent);
|
|
|
|
+
|
|
|
|
+ if (r.getCode() == CommonConstants.SUCCESS){
|
|
|
|
+ HnqzUser user = SecurityUtils.getUser();
|
|
|
|
+ String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, wmTaskContent.getTemp30(), user.getId());
|
|
|
|
+ redisTemplate.delete(key);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return r;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 保存任务内容
|
|
|
|
+ *
|
|
|
|
+ * @param wmTaskContent 任务内容表
|
|
|
|
+ * @return R
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation(value = "任务-保存任务内容", notes = "保存任务内容")
|
|
|
|
+ @SysLog("保存任务内容")
|
|
|
|
+ @PostMapping("/task-content/draft")
|
|
|
|
+ public R taskContentDraft(@RequestBody WmTaskContent wmTaskContent) {
|
|
|
|
+
|
|
|
|
+ HnqzUser user = SecurityUtils.getUser();
|
|
|
|
+
|
|
|
|
+ String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, wmTaskContent.getTemp30(), user.getId());
|
|
|
|
+
|
|
|
|
+ redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(wmTaskContent));
|
|
|
|
+
|
|
|
|
+ return R.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取任务草稿
|
|
|
|
+ *
|
|
|
|
+ * @param taskTypeId 任务类型id
|
|
|
|
+ * @return R
|
|
|
|
+ */
|
|
|
|
+ @ApiOperation(value = "任务-获取任务草稿", notes = "获取任务草稿")
|
|
|
|
+ @SysLog("获取任务草稿")
|
|
|
|
+ @GetMapping("/task-content/draft/{task_type_id}")
|
|
|
|
+ public R taskContentDraft(@PathVariable(value = "task_type_id") Integer taskTypeId) {
|
|
|
|
+
|
|
|
|
+ HnqzUser user = SecurityUtils.getUser();
|
|
|
|
+
|
|
|
|
+ String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, taskTypeId, user.getId());
|
|
|
|
+
|
|
|
|
+ String o = (String) redisTemplate.opsForValue().get(key);
|
|
|
|
+
|
|
|
|
+ return R.ok(StringUtils.isNotEmpty(o) ? JSONUtil.toBean(o, WmTaskContent.class) : null );
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 修改任务内容表
|
|
* 修改任务内容表
|
|
*
|
|
*
|