update code

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));
     }
 

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));
     }
 }

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())){

yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java

@@ -36,7 +36,7 @@ public interface SmzSspProblemmodifyMapper
      * @param smzSspProblemmodify 质量整改
      * @return 质量整改集合
      */
-    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify);
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify);
 
     /**
      * 查询质量整改列表
@@ -51,7 +51,7 @@ public interface SmzSspProblemmodifyMapper
      * @param smzSspProblemmodify 查询条件
      * @return List<Map<String, Integer>>
      */
-    public List<Map<String, Object>> findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify);
+    public List<Map<String, Object>> findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify);
 
     /**
      * 根据状态分组统计数量

yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java

@@ -37,7 +37,7 @@ public interface ISmzSspProblemmodifyService
      * @param smzSspProblemmodify 质量整改
      * @return 质量整改集合
      */
-    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify);
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify);
 
     /**
      * 查询质量整改列表
@@ -52,7 +52,7 @@ public interface ISmzSspProblemmodifyService
      * @param smzSspProblemmodify 查询条件
      * @return List<Map<String, Integer>>
      */
-    public Map<String, Object> findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify);
+    public Map<String, Object> findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify);
 
     /**
      * 新增质量整改

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<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify)
+    public List<SmzSspProblemmodify> selectSmzSspProblemmodifyList(SmzSspProblemmodifyWhere smzSspProblemmodify)
     {
         return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyList(smzSspProblemmodify);
     }
@@ -93,7 +93,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
      * @return List<Map<String, Integer>>
      */
     @Override
-    public Map<String, Object> findProblemmodifyGroupByCheckState(SmzSspProblemmodify smzSspProblemmodify) {
+    public Map<String, Object> findProblemmodifyGroupByCheckState(SmzSspProblemmodifyWhere smzSspProblemmodify) {
         List<Map<String, Object>> dataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodify);
         Map<String, Object> dataMap = new HashMap<>();
         if(dataList!=null && dataList.size()>0){

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
     </sql>
 
-    <select id="selectSmzSspProblemmodifyList" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
+    <select id="selectSmzSspProblemmodifyList" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
         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 &lt; 4
@@ -80,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkUser != null  and checkUser != ''"> and ssp.checkUser = #{checkUser}</if>
             <if test="checkUserPhone != null  and checkUserPhone != ''"> and ssp.checkUserPhone = #{checkUserPhone}</if>
             <if test="isDel != null "> and ssp.isDel = #{isDel}</if>
+            <if test="startDate!=null">and DATE(ssp.createtime)>=DATE(#{startDate})</if>
+            <if test="endDate!=null">and DATE(ssp.createtime) &lt;= DATE(#{endDate})</if>
             <if test="createUser != null  and createUser != ''"> and ssp.createUser like concat('%', #{createUser}, '%')</if>
             <if test="createTime != null "> and ssp.createTime = #{createTime}</if>
             <if test="updateUser != null  and updateUser != ''"> and ssp.updateUser = #{updateUser}</if>
@@ -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
         <if test="infoType !=null">and infoType=#{infoType}</if>
         <if test="roleType !=null and roleType>0">and roleType=#{roleType}</if>
+        <if test="startDate!=null">and DATE(createtime)>=DATE(#{startDate})</if>
+        <if test="endDate!=null">and DATE(createtime) &lt;= DATE(#{endDate})</if>
         <if test="projectId > 0"> and projectId=#{projectId}</if>
         <if test="projectId &lt;= 0">
         AND  projectId IN (
@@ -474,6 +478,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
         <if test="infoType !=null">and infoType=#{infoType}</if>
         <if test="roleType !=null  and roleType>0">and roleType=#{roleType}</if>
+        <if test="startDate!=null">and DATE(createtime)>=DATE(#{startDate})</if>
+        <if test="endDate!=null">and DATE(createtime) &lt;= DATE(#{endDate})</if>
         and ((updateTime is null and  date(nickedTime) &lt; date(now()) ) or  date(updateTime )>date(nickedTime))
         <if test="projectId > 0"> and projectId=#{projectId}</if>
         <if test="projectId &lt;= 0">