wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

修复bug

pull/4/head
zhangqihang 2024-02-22 08:42:40 +08:00
parent 0daa256c35
commit c4730709b2
13 changed files with 231 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyProjectsController.java
View File

@ -404,5 +404,41 @@ public class AppKeyProjectsController extends BaseController {
return map;
}
/**去修改页面获取数据
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = personnelmanagementService.findByOutsourced(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**处罚管理列表 查询自己可以处罚的重点工程 角标计算逻辑 查询重点工程中所有处罚未选择是否处罚的隐患累加
* @throws Exception
*/
@RequestMapping(value="/getPUNISHlist")
@ResponseBody
public Object getPUNISHlist(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = outsourcedService.getPUNISHlist(page); //列出OutSourced列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

21
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
View File

@ -664,4 +664,25 @@ public class AppKeyprojectCheckController extends BaseController {
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患
* @param page
* @throws Exception
*/
@RequestMapping(value="/punishlist")
@ResponseBody
public Object punishlist(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = keyprojectHiddenService.getpunishlist(page); //列出KeyprojectCheck列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
}

2
src/main/java/com/zcloud/mapper/datasource/relatedparty/OutSourcedMapper.java
View File

@ -90,5 +90,7 @@ public interface OutSourcedMapper{
List<PageData> outSouceslistPage(Page page);
Integer getDingWeiSum(PageData pd);
List<PageData> getPUNISHlistPage(Page page);
}

2
src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementMapper.java
View File

@ -66,5 +66,7 @@ public interface PersonnelManagementMapper{
void editPassword(PageData pd);
PageData findForLogin(PageData pd);
PageData findByOutsourced(PageData pd);
}

2
src/main/java/com/zcloud/service/keyProjects/KeyprojectHiddenService.java
View File

@ -192,5 +192,7 @@ public interface KeyprojectHiddenService {
* @return
*/
String getCorpInfoIdByHiddenId(PageData pd);
List<PageData> getpunishlist(Page page);
}

1
src/main/java/com/zcloud/service/keyProjects/impl/KeyprojectHiddenServiceImpl.java
View File

@ -264,5 +264,6 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
public String getCorpInfoIdByHiddenId(PageData pd) {
return hiddenMapper.getCorpInfoIdByHiddenId(pd);
}
}

2
src/main/java/com/zcloud/service/relatedparty/OutSourcedService.java
View File

@ -95,5 +95,7 @@ public interface OutSourcedService{
List<PageData> outSouceslistPage(Page page);
Integer getDingWeiSum(PageData pd);
List<PageData> getPUNISHlist(Page page);
}

5
src/main/java/com/zcloud/service/relatedparty/impl/OutSourcedServiceImpl.java
View File

@ -147,5 +147,10 @@ public class OutSourcedServiceImpl implements OutSourcedService{
return outsourcedMapper.getDingWeiSum(pd);
}
@Override
public List<PageData> getPUNISHlist(Page page) {
return outsourcedMapper.getPUNISHlistPage(page);
}
}

2
src/main/java/com/zcloud/service/specialoperation/PersonnelManagementService.java
View File

@ -66,5 +66,7 @@ public interface PersonnelManagementService{
void editPassword(PageData updateUser) throws Exception;
PageData findForLogin(PageData pd);
PageData findByOutsourced(PageData pd);
}

5
src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementServiceImpl.java
View File

@ -105,5 +105,10 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
return personnelmanagementMapper.findForLogin(pd);
}
@Override
public PageData findByOutsourced(PageData pd) {
return personnelmanagementMapper.findByOutsourced(pd);
}
}

54
src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
View File

@ -1569,33 +1569,33 @@
<select id="getpunishlistPage" parameterType="page" resultType="pd">
SELECT
u.UNITS_NAME,
per.`NAME` as PERSON_NAME,
ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
c.KEYPROJECTCHECK_ID,
p.KEYPROJECTPUNISH_ID,
p.HANDLED,
p.REASON,
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
u.UNITS_NAME,
per.`NAME` as PERSON_NAME,
ifnull(v.`NAME`,vv.`NAME`) as CREATOR_NAME,
c.KEYPROJECTCHECK_ID,
p.KEYPROJECTPUNISH_ID,
p.HANDLED,
p.REASON,
vi.`NAME` as RECTIFICATIONOR_NAME,
h.*
FROM
bus_keyproject_hidden h
LEFT JOIN us_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN us_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN us_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN us_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN i_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN i_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN us_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
bus_keyproject_hidden h
LEFT JOIN bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
LEFT JOIN bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID
LEFT JOIN bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID
LEFT JOIN vi_user_all v ON v.USER_ID = p.CREATOR
LEFT JOIN vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON
LEFT JOIN bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR
WHERE
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
and (P.HANDLED = '0' OR P.HANDLED IS NULL)
</if>
<if test="pd.HANDLED==2">
and P.HANDLED = '1'
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
h.ISDELETE = '0'
<if test="pd.HANDLED==1">
and (P.HANDLED = '0' OR P.HANDLED IS NULL)
</if>
<if test="pd.HANDLED==2">
and P.HANDLED = '1'
</if>
AND ( c.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} OR h.FOREIGN_ID = #{pd.OUTSOURCED_ID} )
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
@ -1603,8 +1603,8 @@
)
</if>
ORDER BY
h.ISPUNISH ASC,
p.HANDLED DESC
h.ISPUNISH ASC,
p.HANDLED DESC
</select>
<select id="getSmsList" parameterType="pd" resultType="pd">

115
src/main/resources/mybatis/datasource/relatedparty/OutSourcedMapper.xml
View File

@ -331,7 +331,7 @@
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
vuad.NAME CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
from
<include refid="tableName"></include> f
@ -340,7 +340,8 @@
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USERNAME
LEFT JOIN sys_user vua on f.CREATOR = vua.USERNAME and vua.ISDELETE = '0'
LEFT JOIN oa_department vuad ON vuad.DEPARTMENT_ID = vua.DEPARTMENT_ID
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
where f.ISDELETE = '0'
@ -648,6 +649,8 @@
<!-- 列表 -->
<select id="outSouceslistPage" parameterType="page" resultType="pd">
select
f.WORK_LONGITUDE,
f.WORK_LATITUDE,
f.CONTRACT_PIC,
f.STARTTIME,
f.ENDTIME,
@ -850,4 +853,112 @@
AND (WORK_LONGITUDE IS NULL or WORK_LONGITUDE = '' )
) c
</select>
<select id="getPUNISHlistPage" parameterType="page" resultType="pd">
select
f.WORK_LONGITUDE,
f.WORK_LATITUDE,
f.CONTRACT_PIC,
f.STARTTIME,
f.ENDTIME,
f.OUTSOURCED_NAME,
f.CONTRACT_STIME,
f.CONTRACT_ETIME,
f.CONTRACT_NUM,
f.UNITS_APTITUDE,
f.UNITS_PIC,
f.UNITS_PHONE,
f.MANAGE_NAME,
f.DESIGE,
f.MANAGE_APTITUDE,
f.MANAGE_PIC,
f.MANAGE_PHONE,
f.MEASURES,
f.ATTACHMENTS,
f.REMARKS,
f.TRAINING_NAME,
f.TRAINING_PIC,
f.TRAINING_STIME,
f.TRAINING_ETIME,
f.RECORDS,
f.SHEET,
f.EXAMINATION,
f.OATTACHMENTS,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.CORPINFO_ID,
f.APPLICANT,
f.STATE,
f.OUTSOURCED_ID,
f.UNITS_APTITUDEPATH,
f.MANAGE_APTITUDEPATH,
f.MEASURESPATH,
f.DESIGEPATH,
f.ATTACHMENTSPATH,
f.RECORDSPATH,
f.SHEETPATH,
f.EXAMINATIONPATH,
f.OATTACHMENTSPATH,
a.NAME as DEPARTMENT_ID,
pcij.NAME Q_DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
b.UNITS_NAME as UNITS_NAME,
vua.NAME OUTSOURCED_CREATOR_NAME,
pci.NAME Q_COMPETENT_DEPT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
,ifnull(cfsl.co,0) as cfcount
from
<include refid="tableName"></include> f
LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USERNAME
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
left join (SELECT PUN.OUTSOURCED_ID,COUNT( distinct PUN.HIDDEN_ID) co FROM (
SELECT
f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
LEFT JOIN BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL
and f.ISPUNISH is null
) PUN GROUP BY PUN.OUTSOURCED_ID ) cfsl on cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件-->
f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
and f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{pd.PUNISHUser} ), '%' )
AND f.STATE = '1'
ORDER BY
cfsl.co DESC,
f.OPERATTIME DESC
</select>
</mapper>

14
src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
View File

@ -33,7 +33,8 @@
f.OPERATTIME,
f.ISDELETE,
f.CORPINFO_ID,
f.PERSONNELMANAGEMENT_ID
f.PERSONNELMANAGEMENT_ID,
f.PASSWORD
</sql>
<!-- 字段用于新增 -->
@ -263,4 +264,15 @@
</foreach>
</delete>
<select id="findByOutsourced" parameterType="pd" resultType="pd">
select
f.*
from
<include refid="tableName"></include> f
left join BUS_OUTSOURCED t on t.UNITS_PIC = f.PERSONNELMANAGEMENT_ID
where
t.OUTSOURCED_ID = #{OUTSOURCED_ID}
and t.ISDELETE = '0'
</select>
</mapper>