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 8225396a..e8698686 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,6 +9,7 @@ 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.where.SmzSspProblemmodifyWhere; import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +54,7 @@ public class ProjectProblemmodifyController extends BaseController { * @return */ @GetMapping("/queryCount") - public AjaxResult queryCount(SmzSspProblemmodify smzSspProblemmodify){ + public AjaxResult queryCount(SmzSspProblemmodifyWhere smzSspProblemmodify){ return success(smzSspProblemmodifyService.findProblemmodifyGroupByCheckState(smzSspProblemmodify)); } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java index 1331d348..6b236b8b 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java @@ -175,7 +175,7 @@ public class ProblemmodifyController extends BaseController { } @PostMapping("/listSspProblemmodify") - public AjaxResult listSspProblemmodify(@RequestBody SmzSspProblemmodify where){ + public AjaxResult listSspProblemmodify(@RequestBody SmzSspProblemmodifyWhere where){ return AjaxResult.success(smzSspProblemmodifyService.selectSmzSspProblemmodifyList(where)); } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java index 4f2fb874..bc1dc121 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; +import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +52,7 @@ public class SmzSspProblemmodifyController extends BaseController */ @PreAuthorize("@ss.hasPermi('trouble:sspProblemmodify:list')") @GetMapping("/list") - public TableDataInfo list(SmzSspProblemmodify smzSspProblemmodify) + public TableDataInfo list(SmzSspProblemmodifyWhere smzSspProblemmodify) { startPage(); smzSspProblemmodify.setNowRole(Convert.toStr(getUserFirstRole())); @@ -70,7 +71,7 @@ public class SmzSspProblemmodifyController extends BaseController */ @PreAuthorize("@ss.hasPermi('trouble:sspProblemmodify:query')") @GetMapping("/findGroupCount") - public AjaxResult findGroupCount(SmzSspProblemmodify smzSspProblemmodify) + public AjaxResult findGroupCount(SmzSspProblemmodifyWhere smzSspProblemmodify) { smzSspProblemmodify.setNowRole(Convert.toStr(getUserFirstRole())); if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodify.getNowRole())){ @@ -88,7 +89,7 @@ public class SmzSspProblemmodifyController extends BaseController @PreAuthorize("@ss.hasPermi('trouble:sspProblemmodify:export')") @Log(title = "质量整改", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, SmzSspProblemmodify smzSspProblemmodify) + public void export(HttpServletResponse response, SmzSspProblemmodifyWhere smzSspProblemmodify) { smzSspProblemmodify.setNowRole(Convert.toStr(getUserFirstRole())); if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodify.getNowRole())){ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index 74cb23da..bc7b47c2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -36,7 +36,7 @@ public interface SmzSspProblemmodifyMapper * @param smzSspProblemmodify 质量整改 * @return 质量整改集合 */ - public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + public List selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify); /** * 查询质量整改列表 @@ -51,7 +51,7 @@ public interface SmzSspProblemmodifyMapper * @param smzSspProblemmodify 查询条件 * @return List> */ - public List> findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify); + public List> findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify); /** * 根据状态分组统计数量 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index ed458a9d..0e8d3d14 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -37,7 +37,7 @@ public interface ISmzSspProblemmodifyService * @param smzSspProblemmodify 质量整改 * @return 质量整改集合 */ - public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + public List selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify); /** * 查询质量整改列表 @@ -52,7 +52,7 @@ public interface ISmzSspProblemmodifyService * @param smzSspProblemmodify 查询条件 * @return List> */ - public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify); + public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify); /** * 新增质量整改 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index d4ef9305..6e6fb047 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -72,7 +72,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi * @return 质量整改 */ @Override - public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify) + public List selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify) { return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyList(smzSspProblemmodify); } @@ -93,7 +93,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi * @return List> */ @Override - public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify) { + public Map findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify) { List> dataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodify); Map dataMap = new HashMap<>(); if(dataList!=null && dataList.size()>0){ diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index b0ced483..1506473e 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, projectId, infoType, problemArea, workParts, changeInfo, lordSent, lordSentUser, copySend, copySendUser, checkState, nickedArea, nickedTime, projectType, processName, projectName, nickedInfo, checkUser, checkUserPhone, isDel, createUser, createTime, updateUser, updateTime, marks_picture, marks_video, smark_url, danger_type, recheckSend, recheckSendUser, roleType from smz_ssp_problemmodify - select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType,ssp.createBy, CASE WHEN(ssp.createUser = #{nowUser} or #{nowRole} in ('1','2','3','4') ) and ssp.checkState < 4 @@ -80,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ssp.checkUser = #{checkUser} and ssp.checkUserPhone = #{checkUserPhone} and ssp.isDel = #{isDel} + and DATE(ssp.createtime)>=DATE(#{startDate}) + and DATE(ssp.createtime) <= DATE(#{endDate}) and ssp.createUser like concat('%', #{createUser}, '%') and ssp.createTime = #{createTime} and ssp.updateUser = #{updateUser} @@ -460,6 +462,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT infotype,checkState,COUNT(1) id FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0 and infoType=#{infoType} and roleType=#{roleType} + and DATE(createtime)>=DATE(#{startDate}) + and DATE(createtime) <= DATE(#{endDate}) and projectId=#{projectId} AND projectId IN ( @@ -474,6 +478,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0 and infoType=#{infoType} and roleType=#{roleType} + and DATE(createtime)>=DATE(#{startDate}) + and DATE(createtime) <= DATE(#{endDate}) and ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) and projectId=#{projectId}