2023年6月20日 修复问题

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTingKeTongJi.java

@@ -13,6 +13,8 @@ import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi
 import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj;
 import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
 import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService;
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
+import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
 import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
 import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
 import org.jeecg.modules.kc.qa.entity.KcEvaluation;
@@ -37,7 +39,8 @@ public class SyncTingKeTongJi extends BaseSync {
     @Autowired
     private ChangeTingKeTongJi changeTingKeTongJi;
 
-    //----------------------------------旧系统------------------------------------------
+    @Autowired
+    private IKcXqxnHistoryService kcXqxnHistoryService;
 
     /**
      * 若参数变量名修改 QuartzJobController中也需对应修改
@@ -57,12 +60,28 @@ public class SyncTingKeTongJi extends BaseSync {
      */
     public void run(Map<String, Object> param){
         String xqxn = "";
+        boolean isAll = false;
         if(param != null){
             if(param.containsKey("xqxn")){
                 xqxn = (String)param.get("xqxn");
             }
+            if(param.containsKey("isAll")){
+                String isAllStr = (String)param.get("isAll");
+                if(StringUtils.isNotBlank(isAllStr)){
+                    isAll = Boolean.parseBoolean(isAllStr);
+                }
+            }
+        }
+        if(isAll){
+            QueryWrapper<KcXqxnHistory> qw = new QueryWrapper<>();
+            qw.orderByDesc("end_time");
+            List<KcXqxnHistory> list = kcXqxnHistoryService.list(qw);
+            list.forEach(x -> {
+                changeTingKeTongJi.changeTingKeTongji(x.getTitle());
+            });
+        }else{
+            changeTingKeTongJi.changeTingKeTongji(xqxn);
         }
-        changeTingKeTongJi.changeTingKeTongji(xqxn);
     }
 
     /**

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java

@@ -120,12 +120,23 @@ public class ChangeTingKeTongJi {
 
             QueryWrapper<KcTingke> evaQw = new QueryWrapper<>();
             evaQw.select("count(userid) as pkNum,userid");
+
+            evaQw.apply("(tingketime,kechengbiaoid,userid) in ( select max(tingketime) as tingketime,kechengbiaoid,userid from kc_tingke where true "+
+                "and tingketime >= STR_TO_DATE( '"+ startSj +"', '%Y-%m-%d' ) "+
+                "AND tingketime <= STR_TO_DATE( '" + endSj +"', '%Y-%m-%d' ) "+
+                "and kechengbiaoid is not null "+
+                "GROUP BY userid, kechengbiaoid "+
+                "ORDER BY tingketime desc "+
+                ")"
+            );
+
             evaQw.eq(StringUtils.isNotBlank(userId),"userid",userId);
-            evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
+//            evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
-            evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
+//            evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
-            evaQw.isNotNull("kechengbiaoid");
+            //evaQw.isNotNull("kechengbiaoid");
             evaQw.groupBy("userid");
             evaQw.orderByAsc("tingketime");
+
             List<KcTingke> countTjList = kcTingkeService.list(evaQw);
 
             //Map<String, KcEvaluation> countTj = Maps.newHashMap();

jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java

@@ -83,16 +83,16 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
 								   HttpServletRequest req) {
 		QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluation, req.getParameterMap());
 		if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){
-			KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
+			KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcEvaluation.getXnxq());
 			Date startSjDate = common.getStartTime();
 			Date endSjDate = common.getEndTime();
 			String startSj = DateUtil.format(startSjDate, DatePattern.NORM_DATETIME_FORMAT);
 			String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
 			String xqxn = common.getTitle();
-			if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
+//			if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
-				queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
+			queryWrapper.apply("up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
-				queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
+			queryWrapper.apply("up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
-			}
+//			}
 
 		}
 		Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
@@ -118,16 +118,16 @@ public class KcEvaluationController extends JeecgController<KcEvaluation, IKcEva
 													  HttpServletRequest req) {
 		 QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap());
 		 if(StringUtils.isNotBlank(kcEvaluation.getXnxq())){
-			 KcXqxnHistory common = changeTingKeTongJi.getXqConfig();
+			 KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcEvaluation.getXnxq());
 			 Date startSjDate = common.getStartTime();
 			 Date endSjDate = common.getEndTime();
 			 String startSj = DateUtil.format(startSjDate,DatePattern.NORM_DATETIME_FORMAT);
 			 String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
 			 String xqxn = common.getTitle();
-			 if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
+//			 if(StringUtils.equals(xqxn,kcEvaluation.getXnxq())){
-				 queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
+			 queryWrapper.apply("a.up_date >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
-				 queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
+			 queryWrapper.apply("a.up_date <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
-			 }
+//			 }
 		 }
 		 queryWrapper.isNotNull("a.minkcid");
 		 Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java

@@ -1,32 +1,29 @@
 package org.jeecg.modules.kc.tktj.controller;
 
-import java.util.Arrays;
+import cn.hutool.core.date.DatePattern;
-import java.util.List;
+import cn.hutool.core.date.DateUtil;
-import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-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.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
 import org.jeecg.modules.kc.qa.entity.KcEvaluation;
 import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
 import org.jeecg.modules.kc.tktj.entity.KcKkdw;
 import org.jeecg.modules.kc.tktj.entity.KcTingke;
 import org.jeecg.modules.kc.tktj.entity.KcTkmx;
 import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -35,10 +32,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
+
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
  /**
  * @Description: kc_tingke
@@ -438,5 +438,42 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
 		 return Result.OK(list);
 	 }
 
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param kcTingke
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "调查问卷-回答主表-分页列表查询")
+	 @ApiOperation(value="调查问卷-回答主表-分页列表查询", notes="调查问卷-回答主表-分页列表查询")
+	 @GetMapping(value = "/keTangList")
+	 public Result<IPage<?>> keTangList(KcTingke kcTingke,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest req) {
+		 QueryWrapper<KcTingke> queryWrapper = QueryGenerator.initQueryWrapper("a",kcTingke, req.getParameterMap());
+		 if(org.apache.commons.lang.StringUtils.isNotBlank(kcTingke.getXnxq())){
+			 KcXqxnHistory common = changeTingKeTongJi.getXqConfig(kcTingke.getXnxq());
+			 Date startSjDate = common.getStartTime();
+			 Date endSjDate = common.getEndTime();
+			 String startSj = DateUtil.format(startSjDate, DatePattern.NORM_DATETIME_FORMAT);
+			 String endSj = DateUtil.format(endSjDate,DatePattern.NORM_DATETIME_FORMAT);
+			 String xqxn = common.getTitle();
+//			 if(org.apache.commons.lang.StringUtils.equals(xqxn,kcTingke.getXnxq())){
+			 queryWrapper.apply("a.tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
+			 queryWrapper.apply("a.tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
+//			 }
+		 }
+
+		 queryWrapper.isNotNull("a.kechengbiaoid");
+		 queryWrapper.isNotNull("kb.id");
+		 Page<KcTingke> page = new Page<>(pageNo, pageSize);
+		 IPage<?> pageList = kcTingkeService.keTangList(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/entity/KcTingke.java

@@ -252,5 +252,10 @@ public class KcTingke implements Serializable {
 
     @TableField(exist = false)
     private String pkNum;
+
+    @TableField(exist = false)
+    private String xnxq;
+
+
 //    private java.lang.String tingketime;
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java

@@ -1,14 +1,13 @@
 package org.jeecg.modules.kc.tktj.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.modules.kc.tktj.entity.KcKkdw;
 import org.jeecg.modules.kc.tktj.entity.KcTingke;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.kc.tktj.entity.KcTkmx;
 
 import java.util.List;
@@ -45,4 +44,7 @@ public interface KcTingkeMapper extends BaseMapper<KcTingke> {
     List<KcTingke> getSftk(@Param(Constants.WRAPPER) QueryWrapper<KcTingke> queryWrapper);
 
     IPage<Map<String,Object>> indexListPage(Page<KcTingke> page, @Param(Constants.WRAPPER) QueryWrapper<KcTingke> queryWrapper);
+
+    IPage<Map<String,Object>> keTangList(Page<KcTingke> page, @Param(Constants.WRAPPER) QueryWrapper<KcTingke> queryWrapper);
+
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml

@@ -835,6 +835,61 @@
 
     </select>
 
+    <select id="keTangList" resultType="java.util.Map">
+        SELECT
+            a.*,
+            kb.kcbh,
+            kb.kcmc,
+            kb.xf,
+            kb.skjs,
+            kb.zc,
+            kb.jzglb,
+            kb.xkrs,
+            kb.pkrs,
+            kb.rwbh,
+            kb.kkdw,
+            kb.kcxz,
+            kb.skdd,
+            kb.sksj,
+            kb.jkzc,
+            kb.hh,
+            kb.WEEK,
+            kb.hhks,
+            kb.hhjs,
+            kb.dsz,
+            kb.wwks,
+            kb.wwjs,
+            kb.zbfs,
+            kb.hyid,
+            kb.hyh,
+            kb.hymm,
+            kb.kclj,
+            kb.beizhu,
+            kb.zbpx,
+            kb.kkdwid,
+            kb.skrq,
+            kb.kechengbiaoid,
+            kb.tingkecishu,
+            kb.kkzc,
+            kb.dijizhou,
+            kb.jkzc1,
+            kb.sftk,
+            kb.tkyy,
+            kb.bkjh,
+            kb.sfcj,
+            kb.skxs,
+            kb.kechengbiao1,
+            kb.sfxsk,
+            kb.jgh,
+            kb.bz,
+            kb.jsbh,
+            kb.zt
+        FROM
+        v_tingke a
+        LEFT JOIN kc_ketangbiao kb ON kb.id = a.kechengbiaoid
+        ${ew.customSqlSegment}
+
+    </select>
 
 
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java

@@ -3,9 +3,10 @@ package org.jeecg.modules.kc.tktj.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.kc.qa.entity.KcEvaluation;
 import org.jeecg.modules.kc.tktj.entity.KcKkdw;
 import org.jeecg.modules.kc.tktj.entity.KcTingke;
-import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.kc.tktj.entity.KcTkmx;
 
 import java.util.List;
@@ -42,4 +43,7 @@ public interface IKcTingkeService extends IService<KcTingke> {
     List<KcTingke> getSftk(QueryWrapper<KcTingke> queryWrapper);
 
     IPage<Map<String,Object>> indexListPage(Page<KcTingke> page, QueryWrapper<KcTingke> queryWrapper);
+
+
+    IPage<Map<String,Object>> keTangList(Page<KcTingke> page, QueryWrapper<KcTingke> queryWrapper);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.kc.tktj.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.poi.ss.formula.functions.T;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.kc.tktj.entity.KcKkdw;
 import org.jeecg.modules.kc.tktj.entity.KcTingke;
 import org.jeecg.modules.kc.tktj.entity.KcTkmx;
@@ -11,8 +11,6 @@ import org.jeecg.modules.kc.tktj.mapper.KcTingkeMapper;
 import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import java.util.List;
 import java.util.Map;
 
@@ -84,4 +82,9 @@ public class KcTingkeServiceImpl extends ServiceImpl<KcTingkeMapper, KcTingke> i
     public IPage<Map<String,Object>> indexListPage(Page<KcTingke> page, QueryWrapper<KcTingke> queryWrapper) {
         return baseMapper.indexListPage(page,queryWrapper);
     }
+
+    @Override
+    public IPage<Map<String, Object>> keTangList(Page<KcTingke> page, QueryWrapper<KcTingke> queryWrapper) {
+        return baseMapper.keTangList(page,queryWrapper);
+    }
 }