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

update code

dev_xds
haha 2024-04-06 23:25:16 +08:00
parent ec8cf4060c
commit f4bb8d22df
11 changed files with 46 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/BgWorkTrainController.java
View File

@ -71,7 +71,7 @@ public class BgWorkTrainController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getGroupByDataType") @GetMapping("/getGroupByDataType")
public AjaxResult getGroupByDataType(String deptId, String projectId,String proType){ public AjaxResult getGroupByDataType(String deptId, String projectId){
WorkTrain workTrain = new WorkTrain(); WorkTrain workTrain = new WorkTrain();
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
workTrain.setNowDept(deptId); workTrain.setNowDept(deptId);
@ -80,7 +80,7 @@ public class BgWorkTrainController extends BaseController {
workTrain.setPrjIds(getProjectIds()); workTrain.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_workTrain_getGroupByDataType_"+deptId+"-"+projectId+"-"+proType+Md5Utils.hash(workTrain.getPrjIds()); String key="bgscreen_workTrain_getGroupByDataType_"+deptId+"-"+projectId+"-"+workTrain.getProType()+Md5Utils.hash(workTrain.getPrjIds());
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
@ -88,9 +88,6 @@ public class BgWorkTrainController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
workTrain.setProjectId(Convert.toLong(projectId)); workTrain.setProjectId(Convert.toLong(projectId));
} }
if(proType!=null && !"0".equals(proType)){
workTrain.setProType(projectId);
}
List<WorkTrain> list = workTrainService.getGroupByDataType(workTrain); List<WorkTrain> list = workTrainService.getGroupByDataType(workTrain);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list); return AjaxResult.success(list);

31
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckingController.java
View File

@ -40,7 +40,7 @@ public class ProjectCheckingController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectCheckingList") @GetMapping("/getProjectCheckingList")
public TableDataInfo getProjectCheckingList(String deptId, String projectId,String proType){ public TableDataInfo getProjectCheckingList(String deptId, String projectId){
PageDomain pageDomain = TableSupport.buildPageRequest(); PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum(); Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize(); Integer pageSize = pageDomain.getPageSize();
@ -52,7 +52,7 @@ public class ProjectCheckingController extends BaseController {
surProjectChecking.setPrjIds(getProjectIds()); surProjectChecking.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_projectChecking_getProjectCheckingList_"+pageNum+"-"+pageSize+"-"+"_"+surProjectChecking.getProjectDeptId()+deptId+"_"+projectId+"_"+proType+ Md5Utils.hash(surProjectChecking.getPrjIds()); String key="bgscreen_projectChecking_getProjectCheckingList_"+pageNum+"-"+pageSize+"-"+"_"+surProjectChecking.getProjectDeptId()+deptId+"_"+projectId+"_"+surProjectChecking.getProType()+ Md5Utils.hash(surProjectChecking.getPrjIds());
List<Object> objs=redisCache.getCacheObject(key); List<Object> objs=redisCache.getCacheObject(key);
if(objs!=null){ if(objs!=null){
return getDataTable(objs); return getDataTable(objs);
@ -60,9 +60,6 @@ public class ProjectCheckingController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId)); surProjectChecking.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectChecking.setProType(proType);
}
List<SurProjectChecking> list = surProjectCheckingService.selectBgscreenProjectCheckingList(surProjectChecking); List<SurProjectChecking> list = surProjectCheckingService.selectBgscreenProjectCheckingList(surProjectChecking);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return getDataTable(list); return getDataTable(list);
@ -75,7 +72,7 @@ public class ProjectCheckingController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectCheckingView") @GetMapping("/getProjectCheckingView")
public AjaxResult getProjectCheckingView(String deptId, String projectId,String proType){ public AjaxResult getProjectCheckingView(String deptId, String projectId){
SurProjectChecking surProjectChecking = new SurProjectChecking(); SurProjectChecking surProjectChecking = new SurProjectChecking();
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
surProjectChecking.setProjectDeptId(deptId); surProjectChecking.setProjectDeptId(deptId);
@ -84,7 +81,7 @@ public class ProjectCheckingController extends BaseController {
surProjectChecking.setPrjIds(getProjectIds()); surProjectChecking.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_projectChecking_getProjectCheckingView_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); String key="bgscreen_projectChecking_getProjectCheckingView_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+surProjectChecking.getProType()+Md5Utils.hash(surProjectChecking.getPrjIds());
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
@ -93,9 +90,7 @@ public class ProjectCheckingController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId)); surProjectChecking.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectChecking.setProType(proType);
}
Map<String, Object> data = surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking); Map<String, Object> data = surProjectCheckingService.selectBgscreenProjectCheckingView(surProjectChecking);
redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(data); return success(data);
@ -108,7 +103,7 @@ public class ProjectCheckingController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectCheckingGroupFoChart") @GetMapping("/getProjectCheckingGroupFoChart")
public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId,String proType){ public AjaxResult getProjectCheckingGroupFoChart(String deptId, String projectId){
SurProjectChecking surProjectChecking = new SurProjectChecking(); SurProjectChecking surProjectChecking = new SurProjectChecking();
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
surProjectChecking.setProjectDeptId(deptId); surProjectChecking.setProjectDeptId(deptId);
@ -117,7 +112,7 @@ public class ProjectCheckingController extends BaseController {
surProjectChecking.setPrjIds(getProjectIds()); surProjectChecking.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_projectChecking_getProjectCheckingGroupFoChart_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); String key="bgscreen_projectChecking_getProjectCheckingGroupFoChart_"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+surProjectChecking.getProType()+Md5Utils.hash(surProjectChecking.getPrjIds());
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
@ -126,9 +121,7 @@ public class ProjectCheckingController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId)); surProjectChecking.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectChecking.setProType(proType);
}
List<SurProjectChecking> list = surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking); List<SurProjectChecking> list = surProjectCheckingService.getProjectCheckingGroupFoChart(surProjectChecking);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(list); return success(list);
@ -141,7 +134,7 @@ public class ProjectCheckingController extends BaseController {
* @return * @return
*/ */
@GetMapping("/groupCheckingByProjectId") @GetMapping("/groupCheckingByProjectId")
public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId,String proType){ public AjaxResult groupCheckingByProjectId(String lvl,String deptId, String projectId){
SurProjectChecking surProjectChecking = new SurProjectChecking(); SurProjectChecking surProjectChecking = new SurProjectChecking();
surProjectChecking.setDataTypeLvl2(lvl); surProjectChecking.setDataTypeLvl2(lvl);
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
@ -151,7 +144,7 @@ public class ProjectCheckingController extends BaseController {
surProjectChecking.setPrjIds(getProjectIds()); surProjectChecking.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_projectChecking_groupCheckingByProjectId_"+lvl+"-"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+proType+Md5Utils.hash(surProjectChecking.getPrjIds()); String key="bgscreen_projectChecking_groupCheckingByProjectId_"+lvl+"-"+deptId+"_"+surProjectChecking.getProjectDeptId()+"_"+projectId+"_"+surProjectChecking.getProType()+Md5Utils.hash(surProjectChecking.getPrjIds());
Object obj=redisCache.getCacheObject(key); Object obj=redisCache.getCacheObject(key);
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
@ -160,9 +153,7 @@ public class ProjectCheckingController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectChecking.setProjectId(Convert.toLong(projectId)); surProjectChecking.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectChecking.setProType(proType);
}
List<SurProjectChecking> list = surProjectCheckingService.groupCheckingByProjectId(surProjectChecking); List<SurProjectChecking> list = surProjectCheckingService.groupCheckingByProjectId(surProjectChecking);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(list); return success(list);

7
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectInsuranceController.java
View File

@ -40,7 +40,7 @@ public class ProjectInsuranceController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectInsuranceList") @GetMapping("/getProjectInsuranceList")
public TableDataInfo getProjectInsuranceList(String deptId,String projectId,String proType){ public TableDataInfo getProjectInsuranceList(String deptId,String projectId){
SurProjectInsurance surProjectInsurance = new SurProjectInsurance(); SurProjectInsurance surProjectInsurance = new SurProjectInsurance();
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
surProjectInsurance.setNowDept(deptId); surProjectInsurance.setNowDept(deptId);
@ -49,7 +49,7 @@ public class ProjectInsuranceController extends BaseController {
surProjectInsurance.setPrjIds(getProjectIds()); surProjectInsurance.setPrjIds(getProjectIds());
} }
} }
String key="bgscreen_insurance_getProjectInsuranceList_"+deptId+"-"+projectId+"_"+proType+"_"+surProjectInsurance.getNowDept()+"_"+Md5Utils.hash(surProjectInsurance.getPrjIds()); String key="bgscreen_insurance_getProjectInsuranceList_"+deptId+"-"+projectId+"_"+surProjectInsurance.getProType()+"_"+surProjectInsurance.getNowDept()+"_"+Md5Utils.hash(surProjectInsurance.getPrjIds());
List<Object> objs=redisCache.getCacheObject(key); List<Object> objs=redisCache.getCacheObject(key);
if(objs!=null){ if(objs!=null){
return getDataTable(objs); return getDataTable(objs);
@ -57,9 +57,6 @@ public class ProjectInsuranceController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectInsurance.setProjectId(Convert.toLong(projectId)); surProjectInsurance.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectInsurance.setProType(proType);
}
List<Map<String,Object>> list = surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance); List<Map<String,Object>> list = surProjectInsuranceService.selectBgscreenInsuranceList(surProjectInsurance);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return getDataTable(list); return getDataTable(list);

15
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectSpecialController.java
View File

@ -30,7 +30,7 @@ public class ProjectSpecialController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectSpecialView") @GetMapping("/getProjectSpecialView")
public TableDataInfo getProjectSpecialView(String deptId,String projectId,String proType){ public TableDataInfo getProjectSpecialView(String deptId,String projectId){
SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial();
if(deptId!=null && !"0".equals(deptId)){ if(deptId!=null && !"0".equals(deptId)){
surProjectWorkSpecial.setNowDept(deptId); surProjectWorkSpecial.setNowDept(deptId);
@ -42,9 +42,6 @@ public class ProjectSpecialController extends BaseController {
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); surProjectWorkSpecial.setProjectId(Convert.toLong(projectId));
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectWorkSpecial.setProType(proType);
}
return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial)); return getDataTable(surProjectWorkSpecialService.selectBgscreenWorkSpecialList(surProjectWorkSpecial));
} }
@ -54,7 +51,7 @@ public class ProjectSpecialController extends BaseController {
* @return * @return
*/ */
@GetMapping("/getProjectSpecialList") @GetMapping("/getProjectSpecialList")
public TableDataInfo getProjectSpecialList(String projectId, String activeName, String specialType,String proType){ public TableDataInfo getProjectSpecialList(String projectId, String activeName, String specialType){
SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial();
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
surProjectWorkSpecial.setProjectId(Convert.toLong(projectId)); surProjectWorkSpecial.setProjectId(Convert.toLong(projectId));
@ -65,9 +62,6 @@ public class ProjectSpecialController extends BaseController {
if(specialType!=null && !"0".equals(specialType)){ if(specialType!=null && !"0".equals(specialType)){
surProjectWorkSpecial.setSpecialType(specialType); surProjectWorkSpecial.setSpecialType(specialType);
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectWorkSpecial.setProType(proType);
}
return getDataTable(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial)); return getDataTable(surProjectWorkSpecialService.selectSurProjectWorkSpecialList(surProjectWorkSpecial));
} }
@ -75,7 +69,7 @@ public class ProjectSpecialController extends BaseController {
* 查询项目特种人员数量统计 * 查询项目特种人员数量统计
*/ */
@GetMapping("/findWorkSpecialCount") @GetMapping("/findWorkSpecialCount")
public AjaxResult findWorkSpecialCount(String projectId, String specialType,String proType) public AjaxResult findWorkSpecialCount(String projectId, String specialType)
{ {
SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial(); SurProjectWorkSpecial surProjectWorkSpecial = new SurProjectWorkSpecial();
if(projectId!=null && !"0".equals(projectId)){ if(projectId!=null && !"0".equals(projectId)){
@ -84,9 +78,6 @@ public class ProjectSpecialController extends BaseController {
if(specialType!=null && !"0".equals(specialType)){ if(specialType!=null && !"0".equals(specialType)){
surProjectWorkSpecial.setSpecialType(specialType); surProjectWorkSpecial.setSpecialType(specialType);
} }
if(StringUtils.isNotNull(proType) && !"0".equals(proType)){
surProjectWorkSpecial.setProType(proType);
}
return success(surProjectWorkSpecialService.findWorkSpecialCount(surProjectWorkSpecial)); return success(surProjectWorkSpecialService.findWorkSpecialCount(surProjectWorkSpecial));
} }
} }

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

@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT 1 id,COUNT(1) project_id,'送检数' check_type SELECT 1 id,COUNT(1) project_id,'送检数' check_type
FROM sur_project_check_detection spcd FROM sur_project_check_detection spcd
left join sur_project sp on sp.id = spcd.project_id left join sur_project sp on sp.id = spcd.project_id
WHERE spcd.is_del='0' WHERE spcd.is_del='0' and sp.isDel=0 and sp.progressVisible=0
<if test='checkType !=null and checkType !="0"'> <if test='checkType !=null and checkType !="0"'>
and spcd.check_type= #{checkType} and spcd.check_type= #{checkType}
</if> </if>

10
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--监理单位/总包公司/分包单位--> <!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<where> <where>
and spc.is_del=0 and spc.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId != null "> and spc.project_id = #{projectId}</if> <if test="projectId != null "> and spc.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--监理单位/总包公司/分包单位--> <!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<where> <where>
and spc.is_del=0 and spc.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId != null "> and spc.project_id = #{projectId}</if> <if test="projectId != null "> and spc.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spc.check_result, count(spc.id) as total from sur_project_checking spc select spc.check_result, count(spc.id) as total from sur_project_checking spc
left join sur_project sp on spc.project_id = sp.id left join sur_project sp on spc.project_id = sp.id
<where> <where>
and spc.is_del=0 and spc.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId != null "> and spc.project_id = #{projectId}</if> <if test="projectId != null "> and spc.project_id = #{projectId}</if>
<if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if> <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -366,7 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
SELECT data_type_lvl2,count(1) cnt SELECT data_type_lvl2,count(1) cnt
FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id
and a.is_del=0 and a.is_del=0 and b.isDel=0 and b.progressVisible=0
<if test="projectId != null "> and a.project_id = #{projectId}</if> <if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if> <if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
<if test="proType != null and proType != ''"> and b.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and b.projectType = #{proType}</if>
@ -384,7 +384,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="groupCheckingByProjectId" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult"> <select id="groupCheckingByProjectId" parameterType="SurProjectChecking" resultMap="SurProjectCheckingResult">
SELECT a.project_id,COUNT(1) id,b.projectName SELECT a.project_id,COUNT(1) id,b.projectName
FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id AND a.data_type_lvl2=#{dataTypeLvl2} FROM sur_project_checking a,sur_project b WHERE a.project_id=b.id AND a.data_type_lvl2=#{dataTypeLvl2}
and a.is_del=0 and a.is_del=0 and b.isDel=0 and b.progressVisible=0
<if test="projectId != null "> and a.project_id = #{projectId}</if> <if test="projectId != null "> and a.project_id = #{projectId}</if>
<if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if> <if test="projectDeptId != null "> and b.deptId = #{projectDeptId}</if>
<if test="proType != null and proType != ''"> and b.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and b.projectType = #{proType}</if>

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
View File

@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND azx.insurance_type = 2 and azx.is_del=0 AND azx.insurance_type = 2 and azx.is_del=0
LEFT JOIN sur_project_insurance yqx ON yqx.project_id = sp.id LEFT JOIN sur_project_insurance yqx ON yqx.project_id = sp.id
AND yqx.insurance_type = 1 and yqx.is_del=0 AND yqx.insurance_type = 1 and yqx.is_del=0
where sp.isDel=0 where sp.isDel=0 and sp.isDel=0 and sp.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId != null "> and sp.id = #{projectId}</if> <if test="projectId != null "> and sp.id = #{projectId}</if>

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

@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme 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 sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 where spme.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="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </if>
<if test="projectId != null and projectId > 0">and sp.id = #{projectId}</if> <if test="projectId != null and projectId > 0">and sp.id = #{projectId}</if>
<if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if> <if test='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select year(spms.seal_date) project_id, month(spms.seal_date) dept_id,count(1) id select year(spms.seal_date) project_id, month(spms.seal_date) dept_id,count(1) id
from sur_project_material_seal spms from sur_project_material_seal spms
left join sur_project sp on spms.project_id = sp.id left join sur_project sp on spms.project_id = sp.id
where spms.is_del=0 where spms.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="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='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>
<if test="projectId != null and projectId > 0">and spms.project_id = #{projectId}</if> <if test="projectId != null and projectId > 0">and spms.project_id = #{projectId}</if>
@ -225,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select spme.*,sp.projectName, sd.dept_name from sur_project_material_seal spme 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 sur_project sp on spme.project_id = sp.id
left join sys_dept sd on sd.dept_id = spme.dept_id left join sys_dept sd on sd.dept_id = spme.dept_id
where spme.is_del=0 where spme.is_del=0 and sp.isDel=0 and sp.progressVisible=0
and spme.seal_date>=DATE_SUB(CURDATE(),interval 12 month) and spme.seal_date>=DATE_SUB(CURDATE(),interval 12 month)
<if test="deptId != null and deptId > 0"> and sp.deptId = #{deptId} </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='proType != null and proType != "" and proType != "0" '> and sp.projectType = #{proType}</if>

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

@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT spm.measure_info,COUNT(1) cnt SELECT spm.measure_info,COUNT(1) cnt
FROM sur_project_measure spm FROM sur_project_measure spm
left join sur_project sp on sp.id = spm.project_id left join sur_project sp on sp.id = spm.project_id
WHERE spm.is_del=0 WHERE spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test='measureType !=null and measureType !="0"'> <if test='measureType !=null and measureType !="0"'>
and spm.measure_type = #{measureType} and spm.measure_type = #{measureType}
</if> </if>
@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_type = 'project_measure_info_type' AND sdd2.dict_value = spm.measure_info LEFT JOIN sys_dict_data sdd2 ON sdd2.dict_type = 'project_measure_info_type' AND sdd2.dict_value = spm.measure_info
LEFT JOIN sys_user u1 ON spm.create_by=u1.phonenumber LEFT JOIN sys_user u1 ON spm.create_by=u1.phonenumber
LEFT JOIN sys_user u2 ON spm.update_by=u2.phonenumber LEFT JOIN sys_user u2 ON spm.update_by=u2.phonenumber
WHERE spm.is_del=0 WHERE spm.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test='measureType !=null and measureType !="0"'> <if test='measureType !=null and measureType !="0"'>
and spm.measure_type = #{measureType} and spm.measure_type = #{measureType}
</if> </if>

18
yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkSpecialMapper.xml
View File

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on sd.dept_id = spwp.dept_id left join sys_dept sd on sd.dept_id = spwp.dept_id
left join sys_dict_data sdd on sdd.dict_type = 'project_special_type' and sdd.dict_value = spwp.special_type left join sys_dict_data sdd on sdd.dict_type = 'project_special_type' and sdd.dict_value = spwp.special_type
<where> <where>
and spwp.is_del=0 and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="projectId != null "> and spwp.project_id = #{projectId}</if> <if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="deptId != null "> and spwp.dept_id = #{deptId}</if> <if test="deptId != null "> and spwp.dept_id = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) as total from sur_project_work_special spwp select count(1) as total from sur_project_work_special spwp
left join sur_project sp on sp.id = spwp.project_id left join sur_project sp on sp.id = spwp.project_id
<where> <where>
and spwp.is_del=0 and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0
and date(spwp.credential_expiration_time) <![CDATA[ <= ]]> date(NOW()) and date(spwp.credential_expiration_time) <![CDATA[ <= ]]> date(NOW())
<if test="projectId != null "> and spwp.project_id = #{projectId}</if> <if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) as total from sur_project_work_special spwp select count(1) as total from sur_project_work_special spwp
left join sur_project sp on sp.id = spwp.project_id left join sur_project sp on sp.id = spwp.project_id
<where> <where>
and spwp.is_del=0 and spwp.is_del=0 and sp.isDel=0 and sp.progressVisible=0
and date(spwp.credential_expiration_time) <![CDATA[ > ]]> date(NOW()) and date(spwp.credential_expiration_time) <![CDATA[ > ]]> date(NOW())
<if test="projectId != null "> and spwp.project_id = #{projectId}</if> <if test="projectId != null "> and spwp.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -161,10 +161,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sur_project_work_special s1 sur_project_work_special s1
left join sur_project sp1 on sp1.id = s1.project_id left join sur_project sp1 on sp1.id = s1.project_id
WHERE WHERE
s1.is_del = 0 s1.is_del = 0 and sp1.isDel=0 and sp1.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp1.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp1.deptId = #{nowDept}</if>
<if test="projectId != null "> and s1.project_id = #{projectId}</if> <if test="projectId != null "> and s1.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp1.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp1.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
and s1.project_id in and s1.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=","> <foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sur_project_work_special s2 sur_project_work_special s2
left join sur_project sp2 on sp2.id = s2.project_id left join sur_project sp2 on sp2.id = s2.project_id
WHERE WHERE
s2.is_del = 0 s2.is_del = 0 and sp2.isDel=0 and sp2.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp2.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp2.deptId = #{nowDept}</if>
<if test="projectId != null "> and s2.project_id = #{projectId}</if> <if test="projectId != null "> and s2.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp2.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp2.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
and s2.project_id in and s2.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=","> <foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">
@ -203,10 +203,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s2.project_id s2.project_id
) void ON void.pid = spws.project_id ) void ON void.pid = spws.project_id
WHERE WHERE
spws.is_del = 0 spws.is_del = 0 and sp.isDel=0 and sp.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="projectId != null "> and spws.project_id = #{projectId}</if> <if test="projectId != null "> and spws.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="prjIds !=null and prjIds.size()>0"> <if test="prjIds !=null and prjIds.size()>0">
and spws.project_id in and spws.project_id in
<foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=","> <foreach collection="prjIds" item="item" index="index" open="(" close=")" separator=",">

14
yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
View File

@ -57,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if> <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
<if test="deptId != null"> left join work_train_dept wtd2 on wtd2.train_id = wt.id and wtd2.is_main ='Y'</if> <if test="deptId != null"> left join work_train_dept wtd2 on wtd2.train_id = wt.id and wtd2.is_main ='Y'</if>
<where> <where>
and sp.isDel=0 and sp.progressVisible=0
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
<if test="projectId != null"> and wt.project_id = #{projectId}</if> <if test="projectId != null"> and wt.project_id = #{projectId}</if>
<if test="deptId != null"> and wtd2.dept_id = #{deptId}</if> <if test="deptId != null"> and wtd2.dept_id = #{deptId}</if>
<if test="dataType != null"> and wt.data_type = #{dataType}</if> <if test="dataType != null"> and wt.data_type = #{dataType}</if>
@ -90,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select gr.train_nature as gr_type ,max(gr.id) as maxid from work_train gr select gr.train_nature as gr_type ,max(gr.id) as maxid from work_train gr
left join sur_project sp on sp.id = gr.project_id left join sur_project sp on sp.id = gr.project_id
<where> <where>
and gr.is_del=0 and gr.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="deptId != null"> and sp.deptId = #{deptId}</if> <if test="deptId != null"> and sp.deptId = #{deptId}</if>
<if test="trainType != null and trainType != ''"> and gr.train_type = #{trainType}</if> <if test="trainType != null and trainType != ''"> and gr.train_type = #{trainType}</if>
</where> </where>
@ -109,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
<if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
<where> <where>
and wt.is_del=0 and wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if> <if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if>
<if test="projectId != null"> and wt.project_id = #{projectId}</if> <if test="projectId != null"> and wt.project_id = #{projectId}</if>
@ -269,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
SELECT COUNT(1) cnt,data_type SELECT COUNT(1) cnt,data_type
FROM work_train wt left join sur_project sp on sp.id = wt.project_id FROM work_train wt left join sur_project sp on sp.id = wt.project_id
<where> where sp.isDel=0 and sp.progressVisible=0
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="projectId != null"> and sp.id = #{projectId}</if> <if test="projectId != null"> and sp.id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>
@ -279,7 +281,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where>
GROUP BY data_type GROUP BY data_type
) b ON a.dict_value=b.data_type ) b ON a.dict_value=b.data_type
</select> </select>
@ -292,8 +293,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project sp on sp.id = wt.project_id left join sur_project sp on sp.id = wt.project_id
<if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "0"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value</if>
<if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if> <if test='trainType != null and trainType == "1"'> left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value</if>
<where> where
and wt.is_del=0 and wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0
<if test="dataType != null and dataType != 0 "> and wt.data_type = #{dataType}</if> <if test="dataType != null and dataType != 0 "> and wt.data_type = #{dataType}</if>
<if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if> <if test="nowDept != null and nowDept != ''"> and sp.deptId = #{nowDept}</if>
<if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if> <if test="trainType != null and trainType != ''"> and wt.train_type = #{trainType}</if>
@ -305,7 +306,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where>
group by wt.id group by wt.id
order by wt.create_time desc order by wt.create_time desc
</select> </select>