ccsens_wiki
/
carbasics
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

查询按钮改为list,修改问卷统计,修改导出问卷数据

master
ma 4 years ago
parent
ed86ac2a38
commit
709a9a3bf5
13 changed files with 361 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 307
      src/main/java/com/ccsens/carbasics/api/DebugController.java
  2. 4
      src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java
  3. 2
      src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java
  4. 4
      src/main/java/com/ccsens/carbasics/persist/dao/ButtonConfigDao.java
  5. 2
      src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java
  6. 2
      src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java
  7. 4
      src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
  8. 3
      src/main/java/com/ccsens/carbasics/util/Constant.java
  9. 4
      src/main/resources/application.yml
  10. 60
      src/main/resources/mapper_dao/DataStatisticsDao.xml
  11. 7
      src/main/resources/mapper_dao/FirstAidDao.xml
  12. 1
      src/main/resources/mapper_dao/QuestionnaireDao.xml
  13. 3
      src/main/resources/mapper_dao/QuestionnaireRecordDao.xml

307
src/main/java/com/ccsens/carbasics/api/DebugController.java
View File

@ -1,12 +1,18 @@
package com.ccsens.carbasics.api;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.text.StrFormatter;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.carbasics.util.Constant;
import com.ccsens.carbasics.util.DefaultCodeError;
import com.ccsens.common.bean.po.*;
import com.ccsens.common.persist.dao.*;
import com.ccsens.util.ExcelUtil;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.StringUtil;
import com.ccsens.util.exception.BaseException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@ -26,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Api(tags = "DEBUG" , description = "DebugController | ")
@RestController
@ -35,15 +42,315 @@ public class DebugController {
@Resource
private Snowflake snowflake;
@Resource
private ProTaskDetailDao taskDetailDao;
@Resource
private ProTaskSubDao taskSubDao;
@Resource
private LabelBusinessDao labelBusinessDao;
@Resource
private ProParentTaskDao parentTaskDao;
@Resource
private ProRoleTaskDao roleTaskDao;
@Resource
private ProTaskPluginDao taskPluginDao;
@Resource
private ProRoleDao roleDao;
@ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value="",method = {RequestMethod.GET, RequestMethod.POST},produces = {"application/json;charset=UTF-8"})
public JsonResponse debug() throws Exception {
addData();
return JsonResponse.newInstance().ok("测试");
}
public void addData() throws Exception{
//1.查询项目id
Long[] projectIds = {
1436146379201454080L,
1443490334792491008L,
1443490427687936000L,
1443491311088050176L,
1443495980086599680L,
1443498394260873216L,
1443505442503532544L,
1443506475258617856L,
1443514245856894976L,
1443515282839838720L,
1443526048691265536L,
1443555407800049664L,
1443762025401688064L,
1443762852904312832L,
1443770871679557632L,
1443771081860325376L,
1443773098532020224L,
1443776293505343488L,
1443786143505326080L,
1443787650472615936L,
1443792356511064064L,
1443872825575481344L,
1443900214611288064L,
1443968425880985600L,
1444097879731085312L,
1444105732944568320L,
1444106519619837952L,
1444117655165607936L,
1444123259498143744L,
1444125735844585472L,
1444130262169690112L,
1444216312619606016L,
1444251162596614144L,
1444255325439139840L,
1444456318831435776L,
1444468524339961856L,
1444479819227340800L,
1444490520578760704L,
1444493759277703168L,
1444525126204006400L,
1444601912271052800L,
1444608719580307456L,
1444617366968475648L,
1444646869262409728L,
1444672152933769216L,
1444812939797471232L,
1444818184023842816L,
1444830753501487104L,
1444836840892014592L,
1444839792243384320L,
1444840911493406720L,
1444841946031071232L,
1444847596459008000L,
1444853304416018432L,
1444854834489729024L,
1444855743361851392L,
1444857721286565888L,
1444859594877968384L,
1444869816770109440L,
1444874752710942720L,
1444891062987661312L,
1444893505444126720L,
1444893888463773696L,
1444897703384588288L,
1444925355055128576L,
1444934994417164288L,
1444952334844305408L,
1444954392309800960L,
1444955509773049856L,
1444958660156727296L,
1445014835690741760L,
1445020591529926656L,
1445033820532514816L,
1445035627350597632L,
1445036608868065280L,
1445199870070890496L,
1445204540638109696L,
1445204666567892992L,
1445223200404545536L,
1445246163950510080L,
1445323707513053184L,
1445329123131269120L,
1445343261513490432L,
1445359652006273024L,
1445548017854980096L,
1445564544155131904L,
1445570315672625152L,
1445577300539351040L,
1445582444324724736L,
1445583311698403328L,
1445584774453534720L,
1445587950783176704L,
1445603891197779968L,
1445620520208048128L,
1445660344973533184L,
1445662269055967232L,
1445686934344310784L,
1445760349960937472L,
1445915270244999168L,
1445926577815953408L,
1445938026336493568L,
1445940249707683840L,
1446017860345536512L,
1446063431521411072L,
1446069431259373568L,
1446156984780070912L,
1446271836118851584L,
1446272213572657152L,
1446296795289493504L,
1446297944780447744L,
1446300429276422144L,
1446338554228908032L,
1446366163725721600L,
1446373460602527744L,
1446383023661785088L,
1446404566387269632L,
1446412803253739520L,
1446414511950274560L,
1446416887549534208L,
1446432348366446592L,
1446637141705891840L,
1446661572465532928L,
1446662778365681664L,
1446669441776754688L,
1446735444854448128L,
1446737797422784512L,
1446749189785788416L,
1446752435816374272L,
1446759986557624320L,
1446760050894053376L,
1446768474797121536L,
1446795257781166080L,
1446838502867345408L,
1447028872280547328L,
1447043833761374208L,
1447054527235891200L,
1447072010726547456L,
1447074496057188352L,
1447075876088061952L,
1447103967380381696L,
1447138920163975168L,
1447139101773144064L,
1447161322809860096L,
1447174761674448896L,
1447191088136986624L,
1447199293445513216L,
1447369469881229312L,
1447374927413125120L,
1447396505974743040L,
1447426851571245056L,
1447446276273872896L,
1447471380600987648L,
1447475281098186752L,
1447496787861708800L,
1447723635375874048L,
1447727386107060224L,
1447736513168416768L,
1447738441965248512L,
1447759617282285568L,
1447760088201961472L,
1447766863198298112L,
1447785319343857664L,
1447797266298707968L,
1447817633968955392L,
1447819664108560384L,
1447826659251331072L,
1447836498983657472L,
1447845666410995712L,
1447846329551429632L,
1447905294465376256L,
1447938052839448576L,
1448194066247589888L,
1448473133999988736L,
1448485063452008448L,
1448499820682813440L,
1448502008796684288L,
1448552378973560832L,
1448567391910109184L,
1448980567378108416L,
1449371992557101056L,
};
for (Long projectId : projectIds) {
System.out.println(projectId);
//2.添加一级任务 taskDetail t_pro_task_sub t_label_business 14 t_pro_parent_task
Long firstTaskId;
ProTaskDetail taskDetailOne = new ProTaskDetail();
taskDetailOne.setId(snowflake.nextId());
taskDetailOne.setName("身份认证");
taskDetailDao.insertSelective(taskDetailOne);
firstTaskId = taskDetailOne.getId();
//添加任务分解
ProTaskSub taskSubOne = new ProTaskSub();
taskSubOne.setId(snowflake.nextId());
taskSubOne.setTaskDetailId(taskDetailOne.getId());
// taskSub.setPlanStartTime(project.getBeginTime());
// taskSub.setPlanEndTime(project.getEndTime());
// taskSub.setPlanDuration(project.getEndTime() - project.getBeginTime());
taskSubDao.insertSelective(taskSubOne);
//任务关联信息（关联项目）
ProParentTask parentTaskOne = new ProParentTask();
parentTaskOne.setId(snowflake.nextId());
parentTaskOne.setTaskDetailId(taskDetailOne.getId());
parentTaskOne.setParentTaskDetailId(projectId);
parentTaskDao.insertSelective(parentTaskOne);
//查找一级任务标签
LabelBusiness labelBusinessOne = new LabelBusiness();
labelBusinessOne.setId(snowflake.nextId());
labelBusinessOne.setBusinessType((byte) 0);
labelBusinessOne.setBusinessId(taskDetailOne.getId());
labelBusinessOne.setLabelId((long) 14);
labelBusinessDao.insertSelective(labelBusinessOne);
//3.添加二级任务 taskDetail t_pro_task_sub t_label_business 19 15 5 t_pro_parent_task t_pro_role_task t_pro_task_plugin
//添加二级任务信息（任务详情）
ProTaskDetail taskDetail = new ProTaskDetail();
taskDetail.setId(snowflake.nextId());
taskDetail.setName("身份认证");
taskDetailDao.insertSelective(taskDetail);
//任务关联信息（关联一级任务）
ProParentTask parentTask = new ProParentTask();
parentTask.setId(snowflake.nextId());
parentTask.setTaskDetailId(taskDetail.getId());
parentTask.setParentTaskDetailId(firstTaskId);
parentTaskDao.insertSelective(parentTask);
//查找重要性标签
LabelBusiness labelBusiness1 = new LabelBusiness();
labelBusiness1.setId(snowflake.nextId());
labelBusiness1.setBusinessType((byte) 0);
labelBusiness1.setBusinessId(taskDetail.getId());
labelBusiness1.setLabelId((long) 19);
labelBusinessDao.insertSelective(labelBusiness1);
LabelBusiness labelBusiness2 = new LabelBusiness();
labelBusiness2.setId(snowflake.nextId());
labelBusiness2.setBusinessType((byte) 0);
labelBusiness2.setBusinessId(taskDetail.getId());
labelBusiness2.setLabelId((long) 15);
labelBusinessDao.insertSelective(labelBusiness2);
LabelBusiness labelBusiness = new LabelBusiness();
labelBusiness.setId(snowflake.nextId());
labelBusiness.setBusinessType((byte) 0);
labelBusiness.setBusinessId(taskDetail.getId());
labelBusiness.setLabelId((long) 5);
labelBusinessDao.insertSelective(labelBusiness);
//任务和角色关联
ProRoleExample proRoleExample = new ProRoleExample();
proRoleExample.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo("科主任");
List<ProRole> roleList = roleDao.selectByExample(proRoleExample);
if (CollectionUtil.isEmpty(roleList)) {
System.out.println("项目:"+projectId+"角色异常");
continue;
}
ProRoleTask roleTask = new ProRoleTask();
roleTask.setId(snowflake.nextId());
roleTask.setRoleId(roleList.get(0).getId());
roleTask.setTaskId(taskDetail.getId());
roleTaskDao.insertSelective(roleTask);
//添加任务分解
ProTaskSub taskSubTwo = new ProTaskSub();
taskSubTwo.setId(snowflake.nextId());
taskSubTwo.setTaskDetailId(taskDetailOne.getId());
// taskSub.setPlanStartTime(project.getBeginTime());
// taskSub.setPlanEndTime(project.getEndTime());
// taskSub.setPlanDuration(project.getEndTime() - project.getBeginTime());
taskSubDao.insertSelective(taskSubTwo);
ProTaskPlugin proTaskPlugin = new ProTaskPlugin();
proTaskPlugin.setId(snowflake.nextId());
proTaskPlugin.setParam("{\"url\":\"https://www.tall.wiki/carbasics/apply-verify\"}");
proTaskPlugin.setPlginCol(1);
proTaskPlugin.setPlginRow(1);
proTaskPlugin.setTaskDetailId(taskDetail.getId());
proTaskPlugin.setPluginId(1442034255218876416L);
proTaskPlugin.setColspan(1);
proTaskPlugin.setRowspan(1);
taskPluginDao.insertSelective(proTaskPlugin);
}
}
public void sql() throws Exception{
String sql = "insert into t_qcp_car_record(id,car_id, type, car_value, time) values({}, 2, 1, {}, {});";

4
src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java
View File

@ -135,9 +135,9 @@ public class QuestionnaireController {
@MustLogin
@ApiOperation(value = "查询首页按钮详情", notes = "")
@RequestMapping(value = "/queryButton", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ButtonVO.ButtonInfo> queryButton(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
public JsonResponse<List<ButtonVO.ButtonInfo>> queryButton(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
log.info("查询首页按钮详情{}",params);
ButtonVO.ButtonInfo buttonInfo = questionnaireService.queryButton(params.getUserId());
List<ButtonVO.ButtonInfo> buttonInfo = questionnaireService.queryButton(params.getUserId());
log.info("查询首页按钮详情结束{}",buttonInfo);
return JsonResponse.newInstance().ok(buttonInfo);
}

2
src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java
View File

@ -89,6 +89,8 @@ public class QuestionnaireDto {
@Data
@ApiModel("判断是否提交了问卷-请求")
public static class Export {
@ApiModelProperty("问卷id")
private Long qid;
@ApiModelProperty("开始时间 年-月-日 时:分:秒")
private String startTime;
@ApiModelProperty("结束时间 年-月-日 时:分:秒")

4
src/main/java/com/ccsens/carbasics/persist/dao/ButtonConfigDao.java
View File

@ -4,6 +4,8 @@ import com.ccsens.carbasics.bean.vo.ButtonVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author AUSU
*/
@ -14,5 +16,5 @@ public interface ButtonConfigDao {
* @param currentTime 当前时间
* @return 按钮信息
*/
ButtonVO.ButtonInfo queryButtonInfo(@Param("time") long currentTime);
List<ButtonVO.ButtonInfo> queryButtonInfo(@Param("time") long currentTime);
}

2
src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java
View File

@ -32,5 +32,5 @@ public interface QuestionnaireRecordDao extends QuestionnaireRecordMapper {
* @param codes 查询试题
* @return 记录
*/
List<Map<String, String>> queryRecord(@Param("export") QuestionnaireDto.Export export, @Param("codes") List<CodeVo.Basic> codes);
List<Map<String, String>> queryRecord(@Param("export") QuestionnaireDto.Export export, @Param("codes") List<CodeVo.Basic> codes,@Param("qid") Long qid);
}

2
src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java
View File

@ -86,7 +86,7 @@ public interface IQuestionnaireService {
* @param userId 用户id
* @return 按钮信息
*/
ButtonVO.ButtonInfo queryButton(Long userId);
List<ButtonVO.ButtonInfo> queryButton(Long userId);
/**
* 查询是否展示问卷调查(临时)

4
src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
View File

@ -303,7 +303,7 @@ public class QuestionnaireService implements IQuestionnaireService{
parentCodes.add("XGZL");
List<CodeVo.Basic> codes = codeDictionariesDao.query(parentCodes);
log.info("code数量:{}", codes.size());
List<Map<String, String>> records = questionnaireRecordDao.queryRecord(export, codes);
List<Map<String, String>> records = questionnaireRecordDao.queryRecord(export, codes,export.getQid());
log.info("记录结束");
List<Long> areaIds = new ArrayList<>();
records.forEach(record ->{
@ -590,7 +590,7 @@ public class QuestionnaireService implements IQuestionnaireService{
@Override
public ButtonVO.ButtonInfo queryButton(Long userId) {
public List<ButtonVO.ButtonInfo> queryButton(Long userId) {
return buttonConfigDao.queryButtonInfo(System.currentTimeMillis());
}

3
src/main/java/com/ccsens/carbasics/util/Constant.java
View File

@ -384,6 +384,7 @@ public class Constant {
HuSHi("HuShi","分诊护士"),
YiSheng("YiSheng","医生"),
ZhiKong("ZhiKong","质控医生"),
CuZhongZhiKong("ZhiKong","卒中质控医生"),
MiShu("MiShu","秘书"),
KeZhuRen("KeZhuRen","科主任"),
FuZhuRen("FuZhuRen","副主任"),
@ -405,7 +406,7 @@ public class Constant {
return HuSHi.positionCode;
}else if (YiSheng.roleName.equals(name)) {
return YiSheng.positionCode;
}else if (ZhiKong.roleName.equals(name)) {
}else if (ZhiKong.roleName.equals(name) || CuZhongZhiKong.roleName.equals(name)) {
return ZhiKong.positionCode;
}else if (MiShu.roleName.equals(name)) {
return MiShu.positionCode;

4
src/main/resources/application.yml
View File

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod
active: test
include: common, util-test

60
src/main/resources/mapper_dao/DataStatisticsDao.xml
View File

@ -473,7 +473,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -509,7 +509,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -545,7 +545,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -581,7 +581,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -603,7 +603,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -625,7 +625,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -672,7 +672,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -715,7 +715,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -758,7 +758,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -946,7 +946,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -981,7 +981,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1025,7 +1025,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1047,7 +1047,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1086,7 +1086,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1124,7 +1124,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1274,7 +1274,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1312,7 +1312,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1350,7 +1350,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1388,7 +1388,7 @@
WHERE
actual.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1438,7 +1438,7 @@
WHERE
answer1.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1482,7 +1482,7 @@
WHERE
answer1.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1535,7 +1535,7 @@
WHERE
answer1.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND qd.rec_status = 0
AND qd.submit_status = 1
@ -1612,7 +1612,7 @@
LEFT JOIN t_area AS a ON a.id = SUBSTRING_INDEX(area.answer,',',1)
WHERE dpt59.rec_status = 0 AND dpt59.question_code = 'XGZL-DPT-60'
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND d.rec_status = 0 AND d.submit_status = 1
AND dpt89.rec_status = 0
@ -1658,7 +1658,7 @@
WHERE
dpt59.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND dpt59.question_code = 'XGZL-DPT-60'
AND d.rec_status = 0
@ -1694,7 +1694,7 @@
WHERE
dpt59.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND dpt59.question_code = 'XGZL-DPT-60'
AND d.rec_status = 0
@ -1742,7 +1742,7 @@
WHERE
dpt59.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND dpt59.question_code = 'XGZL-DPT-60'
AND d.rec_status = 0
@ -1816,7 +1816,7 @@
LEFT JOIN t_area AS a ON a.id = SUBSTRING_INDEX(area.answer,',',1)
WHERE prt29.rec_status = 0 AND prt29.question_code = 'XGZL-PRT-29'
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND d.rec_status = 0 AND d.submit_status = 1
AND prt59.rec_status = 0
@ -1863,7 +1863,7 @@
WHERE
prt29.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND prt29.question_code = 'XGZL-PRT-29'
AND d.rec_status = 0
@ -1899,7 +1899,7 @@
WHERE
prt29.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND prt29.question_code = 'XGZL-PRT-29'
AND d.rec_status = 0
@ -1947,7 +1947,7 @@
WHERE
prt29.rec_status = 0
<if test="param.qid != null">
AND q.id = #{qid} AND q.rec_status = 0
AND q.id = #{param.qid} AND q.rec_status = 0
</if>
AND prt29.question_code = 'XGZL-PRT-29'
AND d.rec_status = 0

7
src/main/resources/mapper_dao/FirstAidDao.xml
View File

@ -285,7 +285,8 @@
t.project_id,
t.updated_at,
t1.answer AS hospitalNumber,
t2.answer AS arriveHospitalTime
t2.answer AS arriveHospitalTime,
t3.answer AS leaveHospitalTime
FROM
t_qcp_first_aid AS t
LEFT JOIN t_qcp_first_aid_record t1 ON t.id = t1.first_aid_id
@ -294,6 +295,9 @@
LEFT JOIN t_qcp_first_aid_record t2 ON t.id = t2.first_aid_id
AND t2.question_code = 'JBXX-DYSJ'
AND t2.rec_status = 0
LEFT JOIN t_qcp_first_aid_record t3 ON t.id = t3.first_aid_id
AND t3.question_code = 'CYQK-CYSJ'
AND t3.rec_status = 0
WHERE
t.rec_status = 0
<if test="param.dataStatus != null"> and data_status = #{param.dataStatus}</if>
@ -373,5 +377,6 @@
)
)
)
ORDER BY leaveHospitalTime DESC
</select>
</mapper>

1
src/main/resources/mapper_dao/QuestionnaireDao.xml
View File

@ -160,6 +160,7 @@
WHERE
rec_status = 0
AND type = 0
ORDER BY end_time
</select>

3
src/main/resources/mapper_dao/QuestionnaireRecordDao.xml
View File

@ -46,7 +46,8 @@
(select t2.identifier from
(select d.id, a.identifier from t_qcp_questionnaire_detail d, tall3.t_sys_auth a where d.user_id = a.user_id and a.identify_type = 1 and d.rec_status = 0 and a.rec_status = 0 group by d.id) t2 where t1.id = t2.id) as 'HOS-TEL'
from
(select d.id, d.submit_status, d.updated_at from t_qcp_questionnaire_detail d, t_qcp_questionnaire_record r where d.id = r.questionnaire_detail_id and d.rec_status = 0 and r.rec_status = 0 ) t1
(select d.id, d.submit_status, d.updated_at from t_qcp_questionnaire_detail d, t_qcp_questionnaire_record r,t_qcp_questionnaire AS q where d.id = r.questionnaire_detail_id and d.rec_status = 0 and r.rec_status = 0 AND q.rec_status = 0
AND d.questionnaire_id = #{qid} ) t1
group by t1.id
</select>

Write Preview
Loading…
Cancel
Save