From cab52bcc018814d6446da6ebf76c7573e91f8149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 16 Oct 2023 00:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/trouble/smzSspProblemmodifyDraft.js | 53 ++ .../views/flowable/task/finished/index.vue | 4 +- .../views/trouble/pshProblemmodify/index.vue | 4 +- .../trouble/pshProblemmodifyDraft/index.vue | 533 ++++++++++++++++++ .../views/trouble/sspProblemmodify/index.vue | 4 +- .../trouble/sspProblemmodifyDraft/index.vue | 533 ++++++++++++++++++ .../ProjectProblemmodifyController.java | 41 ++ .../yanzhu/jh/publics/PublicsController.java | 32 +- .../SmzSspProblemmodifyDraftController.java | 117 ++++ .../domain/SmzSspProblemmodifyDraft.java | 484 ++++++++++++++++ .../SmzSspProblemmodifyDraftMapper.java | 61 ++ .../ISmzSspProblemmodifyDraftService.java | 71 +++ .../SmzSspProblemmodifyDraftServiceImpl.java | 249 ++++++++ .../SmzSspProblemmodifyDraftMapper.xml | 192 +++++++ 14 files changed, 2369 insertions(+), 9 deletions(-) create mode 100644 ruoyi-ui/src/api/trouble/smzSspProblemmodifyDraft.js create mode 100644 ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue create mode 100644 ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodifyDraft.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyDraftMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyDraftService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyDraftMapper.xml diff --git a/ruoyi-ui/src/api/trouble/smzSspProblemmodifyDraft.js b/ruoyi-ui/src/api/trouble/smzSspProblemmodifyDraft.js new file mode 100644 index 00000000..782703d7 --- /dev/null +++ b/ruoyi-ui/src/api/trouble/smzSspProblemmodifyDraft.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询随手拍问题整改质量留痕信息列表 +export function listSmzSspProblemmodifyDraft(query) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft/list', + method: 'get', + params: query + }) +} + +// 查询随手拍问题整改质量留痕信息详细 +export function getSmzSspProblemmodifyDraft(id) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft/' + id, + method: 'get' + }) +} + +// 新增随手拍问题整改质量留痕信息 +export function addSmzSspProblemmodifyDraft(data) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft', + method: 'post', + data: data + }) +} + +// 新增随手拍问题整改质量留痕信息 +export function batchUpdateSmzSspProblemmodifyDraft(data) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft/batchUpdate', + method: 'post', + data: data + }) +} + +// 修改随手拍问题整改质量留痕信息 +export function updateSmzSspProblemmodifyDraft(data) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft', + method: 'put', + data: data + }) +} + +// 删除随手拍问题整改质量留痕信息 +export function delSmzSspProblemmodifyDraft(id) { + return request({ + url: '/trouble/smzSspProblemmodifyDraft/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/flowable/task/finished/index.vue b/ruoyi-ui/src/views/flowable/task/finished/index.vue index 81e75e13..f090f142 100644 --- a/ruoyi-ui/src/views/flowable/task/finished/index.vue +++ b/ruoyi-ui/src/views/flowable/task/finished/index.vue @@ -25,7 +25,7 @@ > - + - - + + +
+ + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + 批量提交 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue index f1610eff..1e7c5cca 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue @@ -16,8 +16,8 @@ @keyup.enter.native="handleQuery" /> - - + + +
+ + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + 批量提交 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java index 6e8e464c..27a48db2 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java @@ -9,12 +9,16 @@ import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.system.service.ISysDictDataService; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; +import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyDraftService; import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @version : V1.0 * @ClassName: ProjectProblemmodifyController @@ -35,6 +39,9 @@ public class ProjectProblemmodifyController extends BaseController { @Autowired ISmzSspProblemmodifyService smzSspProblemmodifyService; + @Autowired + ISmzSspProblemmodifyDraftService smzSspProblemmodifyDraftService; + /** * 查询当前用户问题整改列表 * @param smzSspProblemmodify @@ -98,6 +105,17 @@ public class ProjectProblemmodifyController extends BaseController { return success(smzSspProblemmodifyService.insertSmzSspProblemmodify(smzSspProblemmodify)); } + /** + * 新增问题整改 + * @param smzSspProblemmodifyDraft + * @return + */ + @PostMapping("/addSafetyDraft") + @Log(title = "安全隐患草稿", businessType = BusinessType.INSERT) + public AjaxResult addSafetyDraft(@RequestBody SmzSspProblemmodifyDraft smzSspProblemmodifyDraft){ + return success(smzSspProblemmodifyDraftService.insertSmzSspProblemmodifyDraft(smzSspProblemmodifyDraft)); + } + /** * 新增问题整改 * @param smzSspProblemmodify @@ -109,6 +127,17 @@ public class ProjectProblemmodifyController extends BaseController { return success(smzSspProblemmodifyService.insertSmzSspProblemmodify(smzSspProblemmodify)); } + /** + * 新增问题整改 + * @param smzSspProblemmodifyDraft + * @return + */ + @PostMapping("/addQualityDraft") + @Log(title = "质量隐患草稿", businessType = BusinessType.INSERT) + public AjaxResult addQualityDraft(@RequestBody SmzSspProblemmodifyDraft smzSspProblemmodifyDraft){ + return success(smzSspProblemmodifyDraftService.insertSmzSspProblemmodifyDraft(smzSspProblemmodifyDraft)); + } + /** * 查询问题整改详情 * @param id @@ -162,4 +191,16 @@ public class ProjectProblemmodifyController extends BaseController { public AjaxResult findLastDataByParams(SmzSspProblemmodify smzSspProblemmodify){ return success(smzSspProblemmodifyService.findLastDataByParams(smzSspProblemmodify)); } + + /** + * 查询用户上次在该项目提交的隐患信息 + * @param smzSspProblemmodifyDraft + * @return + */ + @GetMapping("/findDraftLastDataByParams") + public AjaxResult findDraftLastDataByParams(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft){ + List list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); + return success(list!=null?list.get(0):null); + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java index b10c43c0..649b2568 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java @@ -1,10 +1,12 @@ package com.yanzhu.jh.publics; +import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.enums.SysRoleEnum; @@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -57,6 +60,8 @@ PublicsController extends BaseController { @Autowired private ISurProjectAuditinfoService surProjectAuditinfoService; + @Autowired + private RedisCache redisCache; /** * 获取部门列表 @@ -75,9 +80,16 @@ PublicsController extends BaseController { @GetMapping("/queryZgsDeptList") public AjaxResult queryZgsDeptList(SysDept dept) { + String key="publics_queryZgsDeptList"; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } dept.setStatus(PublicStateEnum.OK.getCode()); dept.setComFlag(PublicStateEnum.COMZGS.getCode()); - return success(deptService.selectAllDeptList(dept)); + List list = deptService.selectAllDeptList(dept); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(); } /** @@ -149,7 +161,14 @@ PublicsController extends BaseController { @GetMapping("/selectProjectAllUnitUser") public AjaxResult selectProjectAllUnitUser(SurProjectUserinfo surProjectUserinfo) { - return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo)); + String key="publics_selectProjectAllUnitUser_"+surProjectUserinfo.getProjectId(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List list = surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } /** @@ -158,7 +177,14 @@ PublicsController extends BaseController { @GetMapping("/selectProjectUnitUser") public AjaxResult selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo) { - return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo)); + String key="publics_selectProjectUnitUser_"+surProjectUnitInfo.getProjectId(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List list = surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(list); } /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java new file mode 100644 index 00000000..9446771f --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java @@ -0,0 +1,117 @@ +package com.yanzhu.jh.trouble.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; +import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyDraftService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 随手拍问题整改质量留痕信息Controller + * + * @author JiangYuQi + * @date 2023-10-15 + */ +@RestController +@RequestMapping("/trouble/smzSspProblemmodifyDraft") +public class SmzSspProblemmodifyDraftController extends BaseController +{ + @Autowired + private ISmzSspProblemmodifyDraftService smzSspProblemmodifyDraftService; + + /** + * 查询随手拍问题整改质量留痕信息列表 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:list')") + @GetMapping("/list") + public TableDataInfo list(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) + { + startPage(); + List list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); + return getDataTable(list); + } + + /** + * 导出随手拍问题整改质量留痕信息列表 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:export')") + @Log(title = "随手拍问题整改质量留痕信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) + { + List list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); + ExcelUtil util = new ExcelUtil(SmzSspProblemmodifyDraft.class); + util.exportExcel(response, list, "随手拍问题整改质量留痕信息数据"); + } + + /** + * 获取随手拍问题整改质量留痕信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftById(id)); + } + + /** + * 新增随手拍问题整改质量留痕信息 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:add')") + @Log(title = "随手拍问题整改质量留痕信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) + { + return toAjax(smzSspProblemmodifyDraftService.insertSmzSspProblemmodifyDraft(smzSspProblemmodifyDraft)); + } + + /** + * 批量修改随手拍问题整改质量留痕信息 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:add')") + @Log(title = "随手拍问题整改质量留痕信息", businessType = BusinessType.INSERT) + @PostMapping("/batchUpdate") + public AjaxResult batchAdd(@RequestBody List smzSspProblemmodifytList) + { + return toAjax(smzSspProblemmodifyDraftService.batchUpdateSmzSspProblemmodifyDraft(smzSspProblemmodifytList)); + } + + /** + * 修改随手拍问题整改质量留痕信息 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:edit')") + @Log(title = "随手拍问题整改质量留痕信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SmzSspProblemmodify smzSspProblemmodify) + { + return toAjax(smzSspProblemmodifyDraftService.updateSmzSspProblemmodifyDraft(smzSspProblemmodify)); + } + + /** + * 删除随手拍问题整改质量留痕信息 + */ + @PreAuthorize("@ss.hasPermi('trouble:smzSspProblemmodifyDraft:remove')") + @Log(title = "随手拍问题整改质量留痕信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(smzSspProblemmodifyDraftService.deleteSmzSspProblemmodifyDraftByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodifyDraft.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodifyDraft.java new file mode 100644 index 00000000..6995df7b --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodifyDraft.java @@ -0,0 +1,484 @@ +package com.yanzhu.jh.trouble.domain; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 随手拍问题整改质量留痕信息对象 smz_ssp_problemmodify_draft + * + * @author JiangYuQi + * @date 2023-10-15 + */ +public class SmzSspProblemmodifyDraft extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 项目id */ + @Excel(name = "项目id") + private Long projectId; + + /** 信息类型（0安全，1质量） */ + @Excel(name = "信息类型", readConverterExp = "0=安全，1质量") + private Long infoType; + + /** 留痕图片 */ + @Excel(name = "留痕图片") + private String marksPicture; + + /** 留痕视频 */ + @Excel(name = "留痕视频") + private String marksVideo; + + /** 拍摄位置 */ + @Excel(name = "拍摄位置") + private String problemArea; + + /** 施工部位 */ + @Excel(name = "施工部位") + private String workParts; + + /** 整改要求 */ + @Excel(name = "整改要求") + private String changeInfo; + + /** 主送人姓名 */ + @Excel(name = "主送人姓名") + private String lordSent; + + /** 主送人手机号 */ + @Excel(name = "主送人手机号") + private String lordSentUser; + + /** 抄送人姓名 */ + @Excel(name = "抄送人姓名") + private String copySend; + + /** 抄送人手机号 */ + @Excel(name = "抄送人手机号") + private String copySendUser; + + /** 流程状态（0待整改，1待复检，3复检驳回，4复检通过） */ + @Excel(name = "流程状态", readConverterExp = "0=待整改，1待复检，3复检驳回，4复检通过") + private Long checkState; + + /** 整改定位 */ + @Excel(name = "整改定位") + private String nickedArea; + + /** 整改截至时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "整改截至时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date nickedTime; + + /** 工程类型 */ + @Excel(name = "工程类型") + private String projectType; + + /** 工序名称 */ + @Excel(name = "工序名称") + private String processName; + + /** 工程名称 */ + @Excel(name = "工程名称") + private String projectName; + + /** 留痕说明 */ + @Excel(name = "留痕说明") + private String nickedInfo; + + /** 审核人 */ + @Excel(name = "审核人") + private String checkUser; + + /** 审核人手机号 */ + @Excel(name = "审核人手机号") + private String checkUserPhone; + + /** 智能公司展示的图片url */ + @Excel(name = "智能公司展示的图片url") + private String smarkUrl; + + /** 删除状态（0未删除，1已删除） */ + @Excel(name = "删除状态", readConverterExp = "0=未删除，1已删除") + private Long isDel; + + /** 创建人 */ + @Excel(name = "创建人") + private String createUser; + + /** 创建人名称 */ + @Excel(name = "创建人名称") + private String createUserName; + + /** 创建人部门名称 */ + @Excel(name = "创建人部门名称") + private String createUserDeptName; + + /** 修改人 */ + @Excel(name = "修改人") + private String updateUser; + + /** 隐患类型 */ + @Excel(name = "隐患类型") + private String dangerType; + + /** 复检人 */ + @Excel(name = "复检人") + private String recheckSend; + + /** 复检人手机号 */ + @Excel(name = "复检人手机号") + private String recheckSendUser; + + /** 角色类型 */ + @Excel(name = "角色类型") + private Long roleType; + + /** 问题类型（1常规问题，2专项问题） */ + @Excel(name = "问题类型", readConverterExp = "1=常规问题，2专项问题") + private String problemType; + + private List> fileUrls; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setInfoType(Long infoType) + { + this.infoType = infoType; + } + + public Long getInfoType() + { + return infoType; + } + public void setMarksPicture(String marksPicture) + { + this.marksPicture = marksPicture; + } + + public String getMarksPicture() + { + return marksPicture; + } + public void setMarksVideo(String marksVideo) + { + this.marksVideo = marksVideo; + } + + public String getMarksVideo() + { + return marksVideo; + } + public void setProblemArea(String problemArea) + { + this.problemArea = problemArea; + } + + public String getProblemArea() + { + return problemArea; + } + public void setWorkParts(String workParts) + { + this.workParts = workParts; + } + + public String getWorkParts() + { + return workParts; + } + public void setChangeInfo(String changeInfo) + { + this.changeInfo = changeInfo; + } + + public String getChangeInfo() + { + return changeInfo; + } + public void setLordSent(String lordSent) + { + this.lordSent = lordSent; + } + + public String getLordSent() + { + return lordSent; + } + public void setLordSentUser(String lordSentUser) + { + this.lordSentUser = lordSentUser; + } + + public String getLordSentUser() + { + return lordSentUser; + } + public void setCopySend(String copySend) + { + this.copySend = copySend; + } + + public String getCopySend() + { + return copySend; + } + public void setCopySendUser(String copySendUser) + { + this.copySendUser = copySendUser; + } + + public String getCopySendUser() + { + return copySendUser; + } + public void setCheckState(Long checkState) + { + this.checkState = checkState; + } + + public Long getCheckState() + { + return checkState; + } + public void setNickedArea(String nickedArea) + { + this.nickedArea = nickedArea; + } + + public String getNickedArea() + { + return nickedArea; + } + public void setNickedTime(Date nickedTime) + { + this.nickedTime = nickedTime; + } + + public Date getNickedTime() + { + return nickedTime; + } + public void setProjectType(String projectType) + { + this.projectType = projectType; + } + + public String getProjectType() + { + return projectType; + } + public void setProcessName(String processName) + { + this.processName = processName; + } + + public String getProcessName() + { + return processName; + } + public void setProjectName(String projectName) + { + this.projectName = projectName; + } + + public String getProjectName() + { + return projectName; + } + public void setNickedInfo(String nickedInfo) + { + this.nickedInfo = nickedInfo; + } + + public String getNickedInfo() + { + return nickedInfo; + } + public void setCheckUser(String checkUser) + { + this.checkUser = checkUser; + } + + public String getCheckUser() + { + return checkUser; + } + public void setCheckUserPhone(String checkUserPhone) + { + this.checkUserPhone = checkUserPhone; + } + + public String getCheckUserPhone() + { + return checkUserPhone; + } + public void setSmarkUrl(String smarkUrl) + { + this.smarkUrl = smarkUrl; + } + + public String getSmarkUrl() + { + return smarkUrl; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + public void setCreateUser(String createUser) + { + this.createUser = createUser; + } + + public String getCreateUser() + { + return createUser; + } + public void setUpdateUser(String updateUser) + { + this.updateUser = updateUser; + } + + public String getUpdateUser() + { + return updateUser; + } + public void setDangerType(String dangerType) + { + this.dangerType = dangerType; + } + + public String getDangerType() + { + return dangerType; + } + public void setRecheckSend(String recheckSend) + { + this.recheckSend = recheckSend; + } + + public String getRecheckSend() + { + return recheckSend; + } + public void setRecheckSendUser(String recheckSendUser) + { + this.recheckSendUser = recheckSendUser; + } + + public String getRecheckSendUser() + { + return recheckSendUser; + } + public void setRoleType(Long roleType) + { + this.roleType = roleType; + } + + public Long getRoleType() + { + return roleType; + } + public void setProblemType(String problemType) + { + this.problemType = problemType; + } + + public String getProblemType() + { + return problemType; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getCreateUserDeptName() { + return createUserDeptName; + } + + public void setCreateUserDeptName(String createUserDeptName) { + this.createUserDeptName = createUserDeptName; + } + + public List> getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List> fileUrls) { + this.fileUrls = fileUrls; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("projectId", getProjectId()) + .append("infoType", getInfoType()) + .append("marksPicture", getMarksPicture()) + .append("marksVideo", getMarksVideo()) + .append("problemArea", getProblemArea()) + .append("workParts", getWorkParts()) + .append("changeInfo", getChangeInfo()) + .append("lordSent", getLordSent()) + .append("lordSentUser", getLordSentUser()) + .append("copySend", getCopySend()) + .append("copySendUser", getCopySendUser()) + .append("checkState", getCheckState()) + .append("nickedArea", getNickedArea()) + .append("nickedTime", getNickedTime()) + .append("projectType", getProjectType()) + .append("processName", getProcessName()) + .append("projectName", getProjectName()) + .append("nickedInfo", getNickedInfo()) + .append("checkUser", getCheckUser()) + .append("checkUserPhone", getCheckUserPhone()) + .append("smarkUrl", getSmarkUrl()) + .append("isDel", getIsDel()) + .append("createUser", getCreateUser()) + .append("createTime", getCreateTime()) + .append("updateUser", getUpdateUser()) + .append("updateTime", getUpdateTime()) + .append("dangerType", getDangerType()) + .append("recheckSend", getRecheckSend()) + .append("recheckSendUser", getRecheckSendUser()) + .append("roleType", getRoleType()) + .append("problemType", getProblemType()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyDraftMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyDraftMapper.java new file mode 100644 index 00000000..0af6f366 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyDraftMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.trouble.mapper; + +import java.util.List; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; + +/** + * 随手拍问题整改质量留痕信息Mapper接口 + * + * @author JiangYuQi + * @date 2023-10-15 + */ +public interface SmzSspProblemmodifyDraftMapper +{ + /** + * 查询随手拍问题整改质量留痕信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 随手拍问题整改质量留痕信息 + */ + public SmzSspProblemmodifyDraft selectSmzSspProblemmodifyDraftById(Long id); + + /** + * 查询随手拍问题整改质量留痕信息列表 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 随手拍问题整改质量留痕信息集合 + */ + public List selectSmzSspProblemmodifyDraftList(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft); + + /** + * 新增随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 结果 + */ + public int insertSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft); + + /** + * 修改随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 结果 + */ + public int updateSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft); + + /** + * 删除随手拍问题整改质量留痕信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 结果 + */ + public int deleteSmzSspProblemmodifyDraftById(Long id); + + /** + * 批量删除随手拍问题整改质量留痕信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSmzSspProblemmodifyDraftByIds(Long[] ids); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyDraftService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyDraftService.java new file mode 100644 index 00000000..b91e8a73 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyDraftService.java @@ -0,0 +1,71 @@ +package com.yanzhu.jh.trouble.service; + +import java.util.List; + +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; + +/** + * 随手拍问题整改质量留痕信息Service接口 + * + * @author JiangYuQi + * @date 2023-10-15 + */ +public interface ISmzSspProblemmodifyDraftService +{ + /** + * 查询随手拍问题整改质量留痕信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 随手拍问题整改质量留痕信息 + */ + public SmzSspProblemmodifyDraft selectSmzSspProblemmodifyDraftById(Long id); + + /** + * 查询随手拍问题整改质量留痕信息列表 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 随手拍问题整改质量留痕信息集合 + */ + public List selectSmzSspProblemmodifyDraftList(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft); + + /** + * 新增随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 结果 + */ + public int insertSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft); + + /** + * 批量修改随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyList 随手拍问题整改质量留痕信息 + * @return 结果 + */ + public int batchUpdateSmzSspProblemmodifyDraft(List smzSspProblemmodifyList); + + /** + * 修改随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodify 随手拍问题整改质量留痕信息 + * @return 结果 + */ + public int updateSmzSspProblemmodifyDraft(SmzSspProblemmodify smzSspProblemmodify); + + /** + * 批量删除随手拍问题整改质量留痕信息 + * + * @param ids 需要删除的随手拍问题整改质量留痕信息主键集合 + * @return 结果 + */ + public int deleteSmzSspProblemmodifyDraftByIds(Long[] ids); + + /** + * 删除随手拍问题整改质量留痕信息信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 结果 + */ + public int deleteSmzSspProblemmodifyDraftById(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java new file mode 100644 index 00000000..a9b0e8a9 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java @@ -0,0 +1,249 @@ +package com.yanzhu.jh.trouble.service.impl; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DeptTypeEnum; +import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.mapper.SysDeptMapper; +import com.yanzhu.jh.project.domain.SurProjectUserinfo; +import com.yanzhu.jh.project.mapper.SurProjectUserinfoMapper; +import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; +import com.yanzhu.jh.trouble.domain.SmzSspFileinfo; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.mapper.SmzSspAuditinfoMapper; +import com.yanzhu.jh.trouble.mapper.SmzSspProblemmodifyMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.trouble.mapper.SmzSspProblemmodifyDraftMapper; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodifyDraft; +import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyDraftService; +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + +/** + * 随手拍问题整改质量留痕信息Service业务层处理 + * + * @author JiangYuQi + * @date 2023-10-15 + */ +@Service +public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodifyDraftService +{ + @Autowired + private SysDeptMapper deptMapper; + + @Autowired + private SmzSspAuditinfoMapper smzSspAuditinfoMapper; + + @Autowired + private SmzSspProblemmodifyMapper smzSspProblemmodifyMapper; + + @Autowired + private SurProjectUserinfoMapper surProjectUserinfoMapper; + + @Autowired + private SmzSspProblemmodifyDraftMapper smzSspProblemmodifyDraftMapper; + + /** + * 查询随手拍问题整改质量留痕信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 随手拍问题整改质量留痕信息 + */ + @Override + public SmzSspProblemmodifyDraft selectSmzSspProblemmodifyDraftById(Long id) + { + return smzSspProblemmodifyDraftMapper.selectSmzSspProblemmodifyDraftById(id); + } + + /** + * 查询随手拍问题整改质量留痕信息列表 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 随手拍问题整改质量留痕信息 + */ + @Override + public List selectSmzSspProblemmodifyDraftList(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) + { + return smzSspProblemmodifyDraftMapper.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); + } + + /** + * 新增随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyDraft 随手拍问题整改质量留痕信息 + * @return 结果 + */ + @Override + @Transactional + public int insertSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) + { + SysDept sysDept = deptMapper.selectDeptByUserName(smzSspProblemmodifyDraft.getCreateUser()); + //当前角色时管理员时，修改角色为集团公司 + String roleType = ""; + if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag())){ + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(smzSspProblemmodifyDraft.getProjectId()); + surProjectUserinfo.setCreateBy(smzSspProblemmodifyDraft.getCreateUser()); + List datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo); + if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){ + //说明是甲方经理 + roleType = DeptTypeEnum.JFDBTYPE.getCode(); + }else{ + roleType = DeptTypeEnum.JTGSTYPE.getCode(); + } + }else if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(smzSspProblemmodifyDraft.getProjectId()); + surProjectUserinfo.setCreateBy(smzSspProblemmodifyDraft.getCreateUser()); + List datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo); + if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){ + //说明是甲方经理 + roleType = DeptTypeEnum.JFDBTYPE.getCode(); + }else{ + roleType = DeptTypeEnum.ZGSTYPE.getCode(); + } + }else if(DeptTypeEnum.JLDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.JLDWTYPE.getCode(); + }else if(DeptTypeEnum.ZBDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.ZBDWTYPE.getCode(); + }else if(DeptTypeEnum.FBDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.FBDWTYPE.getCode(); + } + AtomicInteger count = new AtomicInteger(); + for(List urls:smzSspProblemmodifyDraft.getFileUrls()){ + SmzSspProblemmodifyDraft insert = new SmzSspProblemmodifyDraft(); + insert.setProjectId(smzSspProblemmodifyDraft.getProjectId()); + insert.setInfoType(smzSspProblemmodifyDraft.getInfoType()); + insert.setProblemArea(smzSspProblemmodifyDraft.getProblemArea()); + insert.setLordSent(smzSspProblemmodifyDraft.getLordSent()); + insert.setLordSentUser(smzSspProblemmodifyDraft.getLordSentUser()); + insert.setCheckState(smzSspProblemmodifyDraft.getCheckState()); + insert.setCreateUser(smzSspProblemmodifyDraft.getCreateUser()); + insert.setCreateTime(new Date()); + insert.setSmarkUrl(String.join(",", urls)); + insert.setMarksPicture(urls.get(0)); + insert.setProblemType("1"); + insert.setRoleType(Convert.toLong(roleType)); + count.addAndGet(smzSspProblemmodifyDraftMapper.insertSmzSspProblemmodifyDraft(insert)); + } + return count.intValue(); + } + + /** + * 批量修改随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodifyList 随手拍问题整改质量留痕信息 + * @return 结果 + */ + @Override + @Transactional + public int batchUpdateSmzSspProblemmodifyDraft(List smzSspProblemmodifyList) { + int res = 0; + for(SmzSspProblemmodify smzSspProblemmodify:smzSspProblemmodifyList){ + //删除草稿 + smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(smzSspProblemmodify.getId()); + //设置主图 + smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]); + smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify); + SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo(); + smzSspAuditinfo.setMainId(smzSspProblemmodify.getId()); + smzSspAuditinfo.setProcessState("1"); + smzSspAuditinfo.setCreateUser(smzSspProblemmodify.getCreateUser()); + smzSspAuditinfo.setCreateTime(new Date()); + res = smzSspAuditinfoMapper.insertSmzSspAuditinfo(smzSspAuditinfo); + smzSspAuditinfo.setFileUrls(smzSspProblemmodify.getSmarkUrl()); + insertSmzSspFileinfo(smzSspAuditinfo); + } + return res; + } + + /** + * 修改随手拍问题整改质量留痕信息 + * + * @param smzSspProblemmodify 随手拍问题整改质量留痕信息 + * @return 结果 + */ + @Override + @Transactional + public int updateSmzSspProblemmodifyDraft(SmzSspProblemmodify smzSspProblemmodify) + { + //删除草稿 + smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(smzSspProblemmodify.getId()); + //设置主图 + smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]); + smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify); + SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo(); + smzSspAuditinfo.setMainId(smzSspProblemmodify.getId()); + smzSspAuditinfo.setProcessState("1"); + smzSspAuditinfo.setCreateUser(smzSspProblemmodify.getCreateUser()); + smzSspAuditinfo.setCreateTime(new Date()); + int res = smzSspAuditinfoMapper.insertSmzSspAuditinfo(smzSspAuditinfo); + smzSspAuditinfo.setFileUrls(smzSspProblemmodify.getSmarkUrl()); + insertSmzSspFileinfo(smzSspAuditinfo); + return res; + } + + /** + * 新增随手拍文件信息信息 + * + * @param smzSspAuditinfo 随手拍流程信息对象 + */ + private void insertSmzSspFileinfo(SmzSspAuditinfo smzSspAuditinfo) + { + if(smzSspAuditinfo.getFileUrls()!=null){ + String fileUrls[] = smzSspAuditinfo.getFileUrls().split(","); + Long id = smzSspAuditinfo.getId(); + if (StringUtils.isNotNull(fileUrls)) + { + List list = new ArrayList(); + for (String fileUrl: fileUrls) + { + SmzSspFileinfo smzSspFileinfo = new SmzSspFileinfo(); + smzSspFileinfo.setAuditId(id); + smzSspFileinfo.setFileType(0L); + smzSspFileinfo.setFileUrl(fileUrl); + smzSspFileinfo.setIsDel(0L); + smzSspFileinfo.setCreateUser(smzSspAuditinfo.getCreateUser()); + smzSspFileinfo.setCreateTime(new Date()); + list.add(smzSspFileinfo); + } + if (list.size() > 0) + { + smzSspAuditinfoMapper.batchSmzSspFileinfo(list); + } + } + } + } + + /** + * 批量删除随手拍问题整改质量留痕信息 + * + * @param ids 需要删除的随手拍问题整改质量留痕信息主键 + * @return 结果 + */ + @Override + public int deleteSmzSspProblemmodifyDraftByIds(Long[] ids) + { + return smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftByIds(ids); + } + + /** + * 删除随手拍问题整改质量留痕信息信息 + * + * @param id 随手拍问题整改质量留痕信息主键 + * @return 结果 + */ + @Override + public int deleteSmzSspProblemmodifyDraftById(Long id) + { + return smzSspProblemmodifyDraftMapper.deleteSmzSspProblemmodifyDraftById(id); + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyDraftMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyDraftMapper.xml new file mode 100644 index 00000000..35b6ddc3 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyDraftMapper.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select d.id, d.projectId, d.infoType, d.marks_picture, d.marks_video, d.problemArea, d.workParts, d.changeInfo, d.lordSent, d.lordSentUser, d.copySend, d.copySendUser, d.checkState, d.nickedArea, d.nickedTime, d.projectType, d.processName, d.projectName, d.nickedInfo, d.checkUser, d.checkUserPhone, d.smark_url, d.isDel, d.createUser, u.nick_name as createUserName, sd.dept_name as createUserDeptName, d.createTime, d.updateUser, d.updateTime, d.danger_type, d.recheckSend, d.recheckSendUser, d.roleType, d.problemType from smz_ssp_problemmodify_draft d + left join sur_project sp on d.projectId = sp.id + left join sys_user u on u.phonenumber = d.createUser + left join sys_dept sd on sd.dept_id = u.dept_id + + + + + + + + insert into smz_ssp_problemmodify_draft + + projectId, + infoType, + marks_picture, + marks_video, + problemArea, + workParts, + changeInfo, + lordSent, + lordSentUser, + copySend, + copySendUser, + checkState, + nickedArea, + nickedTime, + projectType, + processName, + projectName, + nickedInfo, + checkUser, + checkUserPhone, + smark_url, + isDel, + createUser, + createTime, + updateUser, + updateTime, + danger_type, + recheckSend, + recheckSendUser, + roleType, + problemType, + + + #{projectId}, + #{infoType}, + #{marksPicture}, + #{marksVideo}, + #{problemArea}, + #{workParts}, + #{changeInfo}, + #{lordSent}, + #{lordSentUser}, + #{copySend}, + #{copySendUser}, + #{checkState}, + #{nickedArea}, + #{nickedTime}, + #{projectType}, + #{processName}, + #{projectName}, + #{nickedInfo}, + #{checkUser}, + #{checkUserPhone}, + #{smarkUrl}, + #{isDel}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{updateTime}, + #{dangerType}, + #{recheckSend}, + #{recheckSendUser}, + #{roleType}, + #{problemType}, + + + + + update smz_ssp_problemmodify_draft + + projectId = #{projectId}, + infoType = #{infoType}, + marks_picture = #{marksPicture}, + marks_video = #{marksVideo}, + problemArea = #{problemArea}, + workParts = #{workParts}, + changeInfo = #{changeInfo}, + lordSent = #{lordSent}, + lordSentUser = #{lordSentUser}, + copySend = #{copySend}, + copySendUser = #{copySendUser}, + checkState = #{checkState}, + nickedArea = #{nickedArea}, + nickedTime = #{nickedTime}, + projectType = #{projectType}, + processName = #{processName}, + projectName = #{projectName}, + nickedInfo = #{nickedInfo}, + checkUser = #{checkUser}, + checkUserPhone = #{checkUserPhone}, + smark_url = #{smarkUrl}, + isDel = #{isDel}, + createUser = #{createUser}, + createTime = #{createTime}, + updateUser = #{updateUser}, + updateTime = #{updateTime}, + danger_type = #{dangerType}, + recheckSend = #{recheckSend}, + recheckSendUser = #{recheckSendUser}, + roleType = #{roleType}, + problemType = #{problemType}, + + where id = #{id} + + + + delete from smz_ssp_problemmodify_draft where id = #{id} + + + + delete from smz_ssp_problemmodify_draft where id in + + #{id} + + + \ No newline at end of file