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

修复改版后的bug

test
lucky 4 years ago
parent
f76693d85b
commit
af8de9c7d5
5 changed files with 68 additions and 66 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. 7
      src/main/java/com/ccsens/carbasics/api/TaskController.java
  2. 59
      src/main/resources/mapper_dao/FirstAidDao.xml
  3. 64
      src/main/resources/mapper_dao/OrganizationMemberDao.xml
  4. 2
      src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml
  5. 2
      src/main/resources/mapper_dao/PositionPowerDao.xml

7
src/main/java/com/ccsens/carbasics/api/TaskController.java
View File

@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@ -52,7 +53,8 @@ public class TaskController {
@ApiOperation(value = "查找带时间的日常任务", notes = "")
@RequestMapping(value = "/global", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CTaskVo.QueryTask>> queryGlobalTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryGlobalTask> params) {
List<CTaskVo.QueryTask> queryTasks = taskService.queryGlobalTask(params.getParam(), params.getUserId());
// List<CTaskVo.QueryTask> queryTasks = taskService.queryGlobalTask(params.getParam(), params.getUserId());
List<CTaskVo.QueryTask> queryTasks = new ArrayList<>();
return JsonResponse.newInstance().ok(queryTasks);
}
@ -60,7 +62,8 @@ public class TaskController {
@ApiOperation(value = "查找定期任务", notes = "")
@RequestMapping(value = "/regular", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CTaskVo.QueryTask>> queryRegularTask(@ApiParam @Validated @RequestBody QueryDto<CTaskDto.QueryRegularTask> params) {
List<CTaskVo.QueryTask> queryTasks = taskService.queryRegularTask(params.getParam(), params.getUserId());
// List<CTaskVo.QueryTask> queryTasks = taskService.queryRegularTask(params.getParam(), params.getUserId());
List<CTaskVo.QueryTask> queryTasks = new ArrayList<>();
return JsonResponse.newInstance().ok(queryTasks);
}

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

@ -12,7 +12,7 @@
IF(r4.answer = '是',1,0) AS isJmrs,
IF(r5.answer = '是',1,0) AS isXgzl
from
(select a.* from t_qcp_first_aid a, t_organization_project o where a.hospital_id = o.organization_id and o.project_id = #{param.projectId} and a.rec_status = 0 and o.rec_status = 0 )a
(SELECT a.* FROM t_qcp_first_aid a, t_organization o WHERE a.hospital_id = o.id AND o.id = #{param.projectId} AND a.rec_status = 0 AND o.rec_status = 0)a
left join t_qcp_first_aid_member m
on a.id = m.first_aid_id and m.rec_status = 0
left join t_qcp_first_aid_record r
@ -339,41 +339,34 @@
t_organization_member_position AS omp
WHERE
rec_status = 0
AND department_id IN (
AND ( department_id IN (
SELECT
id
department_id
FROM
(
SELECT
t1.*,
IF (
find_in_set(parent_id, @pids) > 0
<if test="departmentIdList.size() > 0">
<foreach collection="departmentIdList" item="item">
OR id = #{item}
</foreach>
</if>
,@pids := concat(@pids, ',', id),
0
) AS ischild
FROM
(
SELECT
*
FROM
t_organization_department t
WHERE
t.rec_status = 0
ORDER BY
parent_id,
id
) t1,
(SELECT @pids := #{departmentIdStr}) t2
) t3
(
SELECT
t1.*,
IF
(
find_in_set( parent_id, @pids ) > 0
<if test="departmentIdList.size() > 0">
<foreach collection="departmentIdList" item="item">
OR id = #{item}
</foreach>
</if>
,@pids := concat( @pids, ',', department_id ),
0
) AS ischild
FROM
( SELECT * FROM t_organization_department_parent t ORDER BY parent_id, department_id ) t1,
( SELECT @pids := #{departmentIdStr} ) t2
) t3
WHERE
ischild != 0
)
ischild != 0
) OR department_id IN
<foreach collection="departmentIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach> )
)
)
)

64
src/main/resources/mapper_dao/OrganizationMemberDao.xml
View File

@ -17,35 +17,41 @@
</resultMap>
<select id="getMemberPosition" resultMap="MemberPositionMap">
SELECT
m.id,
m.`name`,
m.`contact`,
mp.id AS memberPositionId,
p.id AS positionId,
p.`code` AS positionCode,
d.id AS departmentId,
d.`code` AS departmentCode,
o.id AS organizationId,
o.`code` AS organizationCode
FROM
t_organization_member m,
t_organization_member_position mp,
t_organization_position p,
t_organization_department d,
t_organization o
WHERE
m.user_id = #{userId}
AND m.id = mp.member_id
AND mp.position_id = p.id
AND p.department_id = d.id
AND d.organization_id = o.id
AND o.id = #{projectId}
AND m.rec_status = 0
AND mp.rec_status = 0
AND p.rec_status = 0
AND d.rec_status = 0
AND o.rec_status = 0
SELECT
m.id,
m.`name`,
m.`contact`,
mp.id AS memberPositionId,
p.id AS positionId,
pt.`code` AS positionCode,
d.id AS departmentId,
d.`code` AS departmentCode,
o.id AS organizationId,
o.`code` AS organizationCode
FROM
t_organization_member m,
t_organization_member_position mp,
t_organization_position p,
t_organization_department d,
t_organization o,
t_organization_position_type_relation AS ptr,
t_organization_position_type AS pt
WHERE
m.user_id = #{userId}
AND m.id = mp.member_id
AND mp.position_id = p.id
AND p.department_id = d.id
AND d.organization_id = o.id
AND o.id = #{projectId}
AND m.rec_status = 0
AND mp.rec_status = 0
AND p.rec_status = 0
AND d.rec_status = 0
AND o.rec_status = 0
AND ptr.rec_status = 0
AND pt.rec_status = 0
AND p.id = ptr.position_id
AND ptr.position_type_id = pt.id
</select>
<select id="getHospital" resultType="com.ccsens.carbasics.bean.vo.OrganizationMemberVo$Organization">
SELECT

2
src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml
View File

@ -24,10 +24,10 @@
o.id AS projectId
FROM
`t_organization_member_position` AS omp
LEFT JOIN t_organization AS o ON o.id = od.organization_id
LEFT JOIN t_organization_position AS op ON omp.position_id = op.id
LEFT JOIN t_organization_member AS om ON omp.member_id = om.id
LEFT JOIN t_organization_department AS od ON op.department_id = od.id
LEFT JOIN t_organization AS o ON o.id = od.organization_id
WHERE
omp.rec_status = 0 AND od.rec_status = 0 AND o.rec_status = 0 AND op.rec_status = 0 AND om.rec_status = 0
AND om.user_id = #{uid}

2
src/main/resources/mapper_dao/PositionPowerDao.xml
View File

@ -39,7 +39,7 @@
LEFT JOIN t_organization_position_type AS opt ON opt.id = ptr.position_type_id
LEFT JOIN t_qcp_position_power AS pp ON opt.id = pp.position_type_id
LEFT JOIN t_qcp_menu_power AS mp ON mp.id = pp.power_id
AND op.rec_status = 0
WHERE op.rec_status = 0
AND ptr.rec_status = 0
AND opt.rec_status = 0
AND pp.rec_status = 0

Write Preview
Loading…
Cancel
Save