sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 

# Conflicts:
#	yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
dev_xds
姜玉琦 2024-05-10 02:48:30 +08:00
parent 79faece817 19c540b97e
commit ccbb9b8683
25 changed files with 305 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -24,7 +24,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
active: prod
# 文件上传
servlet:
multipart:

2
ruoyi-wechat/src/main/resources/application.yml
View File

@ -20,7 +20,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
active: prod
# 文件上传
servlet:
multipart:

9
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
View File

@ -220,11 +220,7 @@ public class ProblemmodifyController extends BaseController {
where.setPrjIds(getProjectIds());
}
}
String key="problemmodify_getMonitAndWarning-"+deptId+"_"+projectId+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
where.setDeptId(deptId);
where.setProjectId(projectId);
@ -239,8 +235,9 @@ public class ProblemmodifyController extends BaseController {
//map.put("week",smzSspProblemmodifyService.countByDateRange(where));
map.put("week",smzSspProblemmodifyService.countByDateRangeNew(where));
//各类型整改、未整改数量统计
where.setEndDate(new Date());
where.setStartDate(DateUtils.addDays(new Date(),-30));
map.put("group",smzSspProblemmodifyService.groupByInfotypeCheckStateNew(where));
redisCache.setCacheObject(key, map, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(map);
}

47
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
View File

@ -193,7 +193,7 @@ public class ProjectAttendanceController extends BaseController {
* @return
*/
@GetMapping("/groupByWorkerOnDuty")
public AjaxResult groupByWorkerOnDuty(SurProjectAttendanceData where){
public AjaxResult groupByWorkerOnDuty(SurProjectAttendanceUser where){
Long deptId= where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
@ -210,6 +210,51 @@ public class ProjectAttendanceController extends BaseController {
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}
/**
* 在岗|离岗工人查询
* @param where
* @return
*/
@GetMapping("/queryWorkerByState")
public TableDataInfo queryWorkerByState(SurProjectAttendanceUser where){
Long deptId= where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
startPage();
List<SurProjectAttendanceUser> list=attendanceUserService.queryWorkerByState(where);
return getDataTable(list);
}
/**
* 按部门汇总在岗|离岗人数
* @param where
* @return
*/
@GetMapping("/groupByWorkerState")
public AjaxResult groupByWorkerState(SurProjectAttendanceUser where){
Long deptId= where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
String key="bgscreen_attendance_groupByWorkerState-"+where.getDeptId()+where.getState()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return success(obj);
}
List<SurProjectAttendanceData> list=attendanceUserService.groupByWorkerByDept(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}
/**
* 今日出勤详情
*/

11
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java
View File

@ -70,4 +70,15 @@ public class ProjectCheckDetectionController extends BaseController {
List<SurProjectCheckDetection> list=checkDetectionService.getList(where);
return getDataTable(list);
}
/**
* 按CheckType分组
* @param where
* @return
*/
@PostMapping("/groupCheckType")
public AjaxResult groupCheckType(@RequestBody SurProjectCheckDetection where){
List<SurProjectCheckDetection> list=checkDetectionService.groupCheckType(where);
return AjaxResult.success(list);
}
}

16
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java
View File

@ -101,4 +101,20 @@ public class ProjectMaterialSealController extends BaseController {
return getDataTable(list);
}
@PostMapping("/selectByApprove")
public TableDataInfo selectByApprove(@RequestBody SurProjectMaterialSeal where){
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
Long deptId=where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
startPage();
List<SurProjectMaterialSeal> list=materialSealService.selectByApprove(where);
return getDataTable(list);
}
}

16
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMeasureController.java
View File

@ -3,6 +3,7 @@ package com.yanzhu.jh.bigscreen.web.controller;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.sign.Md5Utils;
@ -51,21 +52,20 @@ public class ProjectMeasureController extends BaseController {
return AjaxResult.success(list);
}
@PostMapping("/getList")
public AjaxResult getList(@RequestBody SurProjectMeasure where){
public TableDataInfo getList(@RequestBody SurProjectMeasure where){
Long deptId= where.getDeptId();
if(deptId==null || deptId<=0){
if (SecurityUtils.isUserB()) {
where.setPrjIds(getProjectIds());
}
}
String key="bgscreen_measure_getList_"+where.getMeasureType()+"_"+where.getDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+"_"+Md5Utils.hash(where.getPrjIds());
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
startPage();
List<SurProjectMeasure> list=measureService.getList(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return getDataTable(list);
}
@PostMapping("/groupMeasureType")
public AjaxResult groupMeasureType(@RequestBody SurProjectMeasure where){
List<SurProjectMeasure> list=measureService.groupMeasureType(where);
return AjaxResult.success(list);
}
}

15
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceUserMapper.java
View File

@ -152,5 +152,18 @@ public interface SurProjectAttendanceUserMapper
* @param where
* @return
*/
List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceData where);
List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where);
/**
* 按部门汇总在岗|离岗人数
* @param where
* @return
*/
List<SurProjectAttendanceData> groupByWorkerByDept(SurProjectAttendanceUser where);
/**
* 在岗|离岗工人查询
* @param where
* @return
*/
List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where);
}

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java
View File

@ -86,4 +86,10 @@ public interface SurProjectCheckDetectionMapper
public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
public List<SurProjectCheckDetection> getList(SurProjectCheckDetection where);
/**
* 按CheckType分组
* @param where
* @return
*/
public List<SurProjectCheckDetection> groupCheckType(SurProjectCheckDetection where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java
View File

@ -80,4 +80,6 @@ public interface SurProjectMaterialSealMapper
* @return
*/
public List<SurProjectMaterialSeal> groupByApprove(SurProjectMaterialSeal where);
public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMeasureMapper.java
View File

@ -72,4 +72,6 @@ public interface SurProjectMeasureMapper
public List<SurProjectMeasure> groupMeasureInfo(SurProjectMeasure where);
public List<SurProjectMeasure> getList(SurProjectMeasure where);
public List<SurProjectMeasure> groupMeasureType(SurProjectMeasure where);
}

14
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceUserService.java
View File

@ -144,7 +144,19 @@ public interface ISurProjectAttendanceUserService
* @param where
* @return
*/
List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceData where);
List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where);
List<SurProjectAttendanceUser> querySurProjectAttendanceUserList(SurProjectAttendanceUser surProjectAttendanceUser);
/**
* 按部门汇总在岗|离岗人数
* @param where
* @return
*/
List<SurProjectAttendanceData> groupByWorkerByDept(SurProjectAttendanceUser where);
/**
* 在岗|离岗工人查询
* @param where
* @return
*/
List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where);
}

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java
View File

@ -86,4 +86,10 @@ public interface ISurProjectCheckDetectionService
public List<Map<String,Object>> findGroupCountByProjectId(Long projectId);
public List<SurProjectCheckDetection> getList(SurProjectCheckDetection where);
/**
* 按CheckType分组
* @param where
* @return
*/
public List<SurProjectCheckDetection> groupCheckType(SurProjectCheckDetection where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java
View File

@ -88,4 +88,6 @@ public interface ISurProjectMaterialSealService
* @return
*/
public List<SurProjectMaterialSeal> groupByApprove(SurProjectMaterialSeal where);
public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMeasureService.java
View File

@ -81,4 +81,6 @@ public interface ISurProjectMeasureService
public List<SurProjectMeasure> groupMeasureInfo(SurProjectMeasure where);
public List<SurProjectMeasure> getList(SurProjectMeasure where);
public List<SurProjectMeasure> groupMeasureType(SurProjectMeasure where);
}

20
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceUserServiceImpl.java
View File

@ -272,7 +272,7 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc
* @return
*/
@Override
public List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceData where) {
public List<SurProjectAttendanceData> groupByWorkerOnDutyByDept(SurProjectAttendanceUser where) {
return surProjectAttendanceUserMapper.groupByWorkerOnDutyByDept(where);
}
@ -280,6 +280,24 @@ public class SurProjectAttendanceUserServiceImpl implements ISurProjectAttendanc
public List<SurProjectAttendanceUser> querySurProjectAttendanceUserList(SurProjectAttendanceUser surProjectAttendanceUser) {
return surProjectAttendanceUserMapper.querySurProjectAttendanceUserList(surProjectAttendanceUser);
}
/**
* 按部门汇总在岗|离岗人数
* @param where
* @return
*/
@Override
public List<SurProjectAttendanceData> groupByWorkerByDept(SurProjectAttendanceUser where) {
return surProjectAttendanceUserMapper.groupByWorkerByDept(where);
}
/**
* 在岗|离岗工人查询
* @param where
* @return
*/
@Override
public List<SurProjectAttendanceUser> queryWorkerByState(SurProjectAttendanceUser where) {
return surProjectAttendanceUserMapper.queryWorkerByState(where);
}
private Date findDate(List<SurProjectAttendanceUser> datas, SurProjectAttendanceUser u, String type) {
for (SurProjectAttendanceUser user:datas) {

9
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
View File

@ -203,5 +203,14 @@ public class SurProjectCheckDetectionServiceImpl extends WeChatMessageServiceImp
public List<SurProjectCheckDetection> getList(SurProjectCheckDetection where) {
return surProjectCheckDetectionMapper.getList(where);
}
/**
* 按CheckType分组
* @param where
* @return
*/
@Override
public List<SurProjectCheckDetection> groupCheckType(SurProjectCheckDetection where) {
return surProjectCheckDetectionMapper.groupCheckType(where);
}
}

5
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java
View File

@ -222,4 +222,9 @@ public class SurProjectMaterialSealServiceImpl extends WeChatMessageServiceImpl
public List<SurProjectMaterialSeal> groupByApprove(SurProjectMaterialSeal where) {
return surProjectMaterialSealMapper.groupByApprove(where);
}
@Override
public List<SurProjectMaterialSeal> selectByApprove(SurProjectMaterialSeal where) {
return surProjectMaterialSealMapper.selectByApprove(where);
}
}

6
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java
View File

@ -206,4 +206,10 @@ public class SurProjectMeasureServiceImpl extends WeChatMessageServiceImpl imple
public List<SurProjectMeasure> getList(SurProjectMeasure where) {
return surProjectMeasureMapper.getList(where);
}
@Override
public List<SurProjectMeasure> groupMeasureType(SurProjectMeasure where) {
return surProjectMeasureMapper.groupMeasureType(where);
}
}

4
yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
View File

@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectFlowLabourInfoVo"/>
<where>
fl.is_del=0
<if test="projectId != null "> and fl.project_id = #{projectId}</if>
<if test="projectId != null and projectId!=0 "> and fl.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and fl.project_name like concat('%', #{projectName}, '%')</if>
<if test="deptId != null "> and fl.dept_id = #{deptId}</if>
<if test="deptId != null and deptId!=0"> and fl.dept_id = #{deptId}</if>
<if test="deptName != null and deptName != ''"> and fl.dept_name like concat('%', #{deptName}, '%')</if>
<if test="subDeptId != null "> and fl.sub_dept_id = #{subDeptId}</if>
<if test="subDeptName != null and subDeptName != ''"> and fl.sub_dept_name like concat('%', #{subDeptName}, '%')</if>

54
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceUserMapper.xml
View File

@ -754,5 +754,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by g.companyTypeId
</select>
<select id="groupByWorkerByDept" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
SELECT p.id, p.projectName NAME,c.dept_name groupName,g.companyTypeId companyId,COUNT(1) cfgid
FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project p,sys_dept c
where u.cfgid=b.id and u.state= #{state} and u.companyId=g.companyId and b.project_id=p.id and c.dept_id=b.sub_dept_id
and p.isDel=0 and p.progressVisible=0
and g.companyTypeId in (1,6,0,2,3,4,5,8)
<if test="deptId!=null and deptId>0">
and p.deptId=#{deptId}
</if>
<if test='proType != null and proType != "" and proType != "0"'> and p.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
and b.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by p.projectName,c.dept_name,g.companyTypeId,p.id
order by p.id
</select>
<select id="queryWorkerByState" parameterType="SurProjectAttendanceUser" resultMap="SurProjectAttendanceUserResult">
SELECT u.id,u.cfgid,u.app_id,u.vendors_code,u.workerId,u.laborWorkerId,u.workerCategory,u.qrCode,u.name,
u.ethnic,u.nativePlace,u.gender,u.birthDate,u.phone,u.photo,u.recentPhoto,
u.groupId,u.leader,u.workTypeCode,u.specWorkType,
u.hatCode,u.state,u.enterDate,u.exitDate,u.companyId,u.vendorId,
u.teamId,u.teamName,u.enterType,u.is_del,u.create_by,u.create_time,u.update_by,u.update_time,
b.project_id,b.sub_dept_id,u.companyName,u.workTypeName,u.groupName,
b.project_id,b.sub_dept_id, g.teamname remark,g.companyName degreeName
FROM sur_project_attendance_user u,sur_project_attendance_cfg b,view_sur_project_attendance_group g,sur_project sp
WHERE u.cfgid=b.id and u.state=#{state} and u.companyId=g.companyId and sp.isDel=0 and sp.progressVisible=0 and b.project_id = sp.id
<if test="id==101">
and g.companyTypeId in (1,6)
</if>
<if test="id==102">
and g.companyTypeId =8
</if>
<if test="id==103">
and g.companyTypeId in (0,2,3,4,5)
</if>
<if test="projectId!=null and projectId>0">
and b.project_id=#{projectId}
</if>
<if test="deptId!=null and deptId>0">
and sp.deptId=#{deptId}
</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
and b.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
</mapper>

25
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -317,7 +317,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
<include refid="selectSurProjectCheckDetectionVo"/>
WHERE spcd.is_del=0
WHERE spcd.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="detectionResult==1">and spcd.detection_result=1</if>
<if test="detectionResult==0">and spcd.detection_result &lt;&gt; 1</if>
<if test="checkType!=null and checkType>0">and spcd.check_type= #{checkType}</if>
<if test="deptId !=null and deptId > 0 ">
and sp.deptId=#{deptId}
@ -332,5 +334,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId !=null and projectId > 0 ">
and spcd.project_id=#{projectId}
</if>
ORDER BY detection_result
</select>
<select id="groupCheckType" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
SELECT spcd.check_type id,count(1) project_id
FROM sur_project_check_detection spcd
LEFT JOIN sur_project sp ON spcd.project_id = sp.id
where spcd.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="deptId !=null and deptId > 0 ">
and sp.deptId=#{deptId}
</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
and spcd.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="projectId !=null and projectId > 0 ">
and spcd.project_id=#{projectId}
</if>
group by spcd.check_type
</select>
</mapper>

22
yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
View File

@ -259,4 +259,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by spme.seal_date desc
) spme
</select>
<select id="selectByApprove" parameterType="SurProjectMaterialSeal" resultMap="SurProjectMaterialSealResult">
select *
from (
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme
left join sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="approveStatus==4">and spme.approve_status = 4</if>
<if test="approveStatus==0">and spme.approve_status &lt;&gt; 4</if>
<if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
<if test="projectId != null and projectId > 0">and sp.id = #{projectId}</if>
<if test="prjIds !=null and prjIds.size()>0">
and sp.id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
order by spme.seal_date desc
) spme
</select>
</mapper>

22
yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
View File

@ -240,6 +240,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId !=null and projectId >0">
AND spm.project_id=#{projectId}
</if>
order by spm.approve_status
</select>
<select id="groupMeasureType" parameterType="SurProjectMeasure" resultMap="SurProjectMeasureResult">
SELECT spm.measure_type id,count(1) project_id
FROM sur_project_measure spm
LEFT JOIN sur_project sp ON spm.project_id = sp.id
where spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="deptId !=null and deptId > 0 ">
and sp.deptId=#{deptId}
</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0">
and spm.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="projectId !=null and projectId > 0 ">
and spm.project_id=#{projectId}
</if>
group by spm.measure_type
</select>
</mapper>

9
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -696,6 +696,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM smz_ssp_problemmodify p
left join sur_project sp on p.projectId=sp.id
WHERE p.isDel=0 and sp.isDel=0
<![CDATA[
and DATE(p.createTime)>=Date(#{startDate}) and Date(p.createTime)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and p.projectId=#{projectId}</if>
<if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -710,6 +713,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '96' as infotype,'4' as checkState,count(1) as total from dev_ai_project_data ad
left join sur_project sp on ad.project_id=sp.id
where sp.isDel=0
<![CDATA[
and DATE(ad.create_time)>=Date(#{startDate}) and Date(ad.create_time)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and ad.project_id=#{projectId}</if>
<if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -724,6 +730,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1
left join sur_project sp on fli1.project_id=sp.id
where fli1.is_del=0
<![CDATA[
and DATE(fli1.create_time)>=Date(#{startDate}) and Date(fli1.create_time)<=Date(#{endDate})
]]>
<if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if>
<if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>