FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目清单->项目经理

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-10-21 13:51:27 +08:00
parent 5c743e92c0
commit 0ee4f63614
4 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+7 -1
View File
@@ -143,7 +143,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
} }
} }
} }
String completedString = builder.delete(builder.length()-1,builder.length()).toString(); /**
* 当""时索引异常
*/
String completedString="";
if (!"".equals(builder.toString())){
completedString = builder.delete(builder.length()-1,builder.length()).toString();
}
list1.setZRBM(completedString); list1.setZRBM(completedString);
} }
else { else {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java
-1
View File
@@ -74,7 +74,6 @@ public class SarStandProjectLibrary extends BaseEntity {
private String projectManager; private String projectManager;
@ApiModelProperty(value = "项目经理名称") @ApiModelProperty(value = "项目经理名称")
@TableField(exist = false) @TableField(exist = false)
private String uName; private String uName;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+2
View File
@@ -435,6 +435,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
Page<SarStandProjectLibrary> page = new Page<>(current, pageSize); Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
IPage<SarStandProjectLibrary> userIPage = new Page<>(); IPage<SarStandProjectLibrary> userIPage = new Page<>();
if (3!=flag) { if (3!=flag) {
//6922
List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag); List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag);
Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag); Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag);
userIPage.setCurrent(current); userIPage.setCurrent(current);
@@ -444,6 +445,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
return userIPage; return userIPage;
} }
else { else {
//6922
flag=2; flag=2;
List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag); List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag);
Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag); Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+93 -71
View File
@@ -41,57 +41,59 @@
<select id="selectCount" resultType="java.lang.Integer"> <select id="selectCount" resultType="java.lang.Integer">
SELECT SELECT
count(sar_stand_project_library.id ) as total count(
library.id
) AS total
FROM FROM
sar_stand_project_library sar_stand_project_library as library
LEFT JOIN ts_user tu ON project_manager = tu.USID LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
WHERE WHERE
<if test="flag == 1"> <if test="flag == 1">
id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
</if> </if>
<if test="flag == 2"> <if test="flag == 2">
id IN ( SELECT project_id FROM sar_stand_project_relation ) library.id IN ( SELECT project_id FROM sar_stand_project_relation )
</if> </if>
<if test="flag == 4"> <if test="flag == 4">
1=1 1=1
</if> </if>
<if test="qu != null"> <if test="qu != null">
<if test="qu.projectNumber != null"> <if test="qu.projectNumber != null">
AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
</if> </if>
<if test="qu.projectName != null"> <if test="qu.projectName != null">
AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
</if> </if>
<if test="qu.projectClassification != null"> <if test="qu.projectClassification != null">
AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
</if> </if>
<if test="qu.projectPlatfor != null"> <if test="qu.projectPlatfor != null">
AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
</if> </if>
<if test="qu.projectGroup != null"> <if test="qu.projectGroup != null">
AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
</if> </if>
<if test="qu.projectStatus != null"> <if test="qu.projectStatus != null">
AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
</if> </if>
<if test="qu.currentNode != null"> <if test="qu.currentNode != null">
AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
</if> </if>
<if test="qu.projectLevel != null"> <if test="qu.projectLevel != null">
AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
</if> </if>
<if test="qu.projectManager != null"> <if test="qu.projectManager != null">
AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
</if> </if>
<if test="qu.productLine != null"> <if test="qu.productLine != null">
AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
</if> </if>
<if test="qu.projectStartDate != null"> <if test="qu.projectStartDate != null">
AND project_start_date &gt;= #{qu.projectStartDate} AND library.project_start_date &gt;= #{qu.projectStartDate}
</if> </if>
<if test="qu.projectEndDate != null"> <if test="qu.projectEndDate != null">
AND project_end_date &lt;= #{qu.projectEndDate} AND library.project_end_date &lt;= #{qu.projectEndDate}
</if> </if>
</if> </if>
@@ -99,57 +101,59 @@
<select id="selectPages" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary"> <select id="selectPages" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
SELECT SELECT
sar_stand_project_library.*, library.*,
tu.UNAME as uName team.`name` as uName
FROM FROM
sar_stand_project_library sar_stand_project_library as library
LEFT JOIN ts_user tu ON project_manager = tu.USID LEFT JOIN sar_stand_project_team as team
ON team.project_code = library.project_number
WHERE WHERE
<if test="flag == 1"> <if test="flag == 1">
id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
</if> </if>
<if test="flag == 2"> <if test="flag == 2">
id IN ( SELECT project_id FROM sar_stand_project_relation ) library.id IN ( SELECT project_id FROM sar_stand_project_relation )
</if> </if>
<if test="flag == 4"> <if test="flag == 4">
1=1 1=1
</if> </if>
<if test="qu != null"> <if test="qu != null">
<if test="qu.projectNumber != null"> <if test="qu.projectNumber != null">
AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
</if> </if>
<if test="qu.projectName != null"> <if test="qu.projectName != null">
AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
</if> </if>
<if test="qu.projectClassification != null"> <if test="qu.projectClassification != null">
AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
</if> </if>
<if test="qu.projectPlatfor != null"> <if test="qu.projectPlatfor != null">
AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
</if> </if>
<if test="qu.projectGroup != null"> <if test="qu.projectGroup != null">
AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
</if> </if>
<if test="qu.projectStatus != null"> <if test="qu.projectStatus != null">
AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
</if> </if>
<if test="qu.currentNode != null"> <if test="qu.currentNode != null">
AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
</if> </if>
<if test="qu.projectLevel != null"> <if test="qu.projectLevel != null">
AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
</if> </if>
<if test="qu.projectManager != null"> <if test="qu.projectManager != null">
AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
</if> </if>
<if test="qu.productLine != null"> <if test="qu.productLine != null">
AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
</if> </if>
<if test="qu.projectStartDate != null"> <if test="qu.projectStartDate != null">
AND project_start_date &gt;= #{qu.projectStartDate} AND library.project_start_date &gt;= #{qu.projectStartDate}
</if> </if>
<if test="qu.projectEndDate != null"> <if test="qu.projectEndDate != null">
AND project_end_date &lt;= #{qu.projectEndDate} AND library.project_end_date &lt;= #{qu.projectEndDate}
</if> </if>
</if> </if>
@@ -158,54 +162,61 @@
<select id="selectPagesWorkFlow" <select id="selectPagesWorkFlow"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary"> resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
SELECT SELECT
sar_stand_project_library.*, library.*, team.`name` AS uName
tu.UNAME as uName
FROM FROM
sar_stand_project_library sar_stand_project_library as library
LEFT JOIN ts_user tu ON project_manager = tu.USID LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
WHERE WHERE
( (
id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id NOT in ( SELECT DISTINCT library.id IN (
STAND_ID FROM SELECT DISTINCT
project_id
FROM
sar_stand_project_relation
WHERE
project_id NOT IN (
SELECT DISTINCT
STAND_ID
FROM
sar_stand_items sar_stand_items
) )
) )
<if test="qu != null"> <if test="qu != null">
<if test="qu.projectNumber != null"> <if test="qu.projectNumber != null">
AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
</if> </if>
<if test="qu.projectName != null"> <if test="qu.projectName != null">
AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
</if> </if>
<if test="qu.projectClassification != null"> <if test="qu.projectClassification != null">
AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
</if> </if>
<if test="qu.projectPlatfor != null"> <if test="qu.projectPlatfor != null">
AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
</if> </if>
<if test="qu.projectGroup != null"> <if test="qu.projectGroup != null">
AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
</if> </if>
<if test="qu.projectStatus != null"> <if test="qu.projectStatus != null">
AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
</if> </if>
<if test="qu.currentNode != null"> <if test="qu.currentNode != null">
AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
</if> </if>
<if test="qu.projectLevel != null"> <if test="qu.projectLevel != null">
AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
</if> </if>
<if test="qu.projectManager != null"> <if test="qu.projectManager != null">
AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
</if> </if>
<if test="qu.productLine != null"> <if test="qu.productLine != null">
AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
</if> </if>
<if test="qu.projectStartDate != null"> <if test="qu.projectStartDate != null">
AND project_start_date &gt;= #{qu.projectStartDate} AND library.project_start_date &gt;= #{qu.projectStartDate}
</if> </if>
<if test="qu.projectEndDate != null"> <if test="qu.projectEndDate != null">
AND project_end_date &lt;= #{qu.projectEndDate} AND library.project_end_date &lt;= #{qu.projectEndDate}
</if> </if>
</if> </if>
) )
@@ -214,53 +225,64 @@
</select> </select>
<select id="selectCountWorkFlow" resultType="java.lang.Integer"> <select id="selectCountWorkFlow" resultType="java.lang.Integer">
SELECT SELECT
count(sar_stand_project_library.id ) as total count(
library.id
) AS total
FROM FROM
sar_stand_project_library sar_stand_project_library AS library
LEFT JOIN ts_user tu ON project_manager = tu.USID LEFT JOIN sar_stand_project_team AS team ON team.project_code = library.project_number
WHERE WHERE
( (
id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id NOT in ( SELECT DISTINCT library.id IN (
STAND_ID FROM SELECT DISTINCT
project_id
FROM
sar_stand_project_relation
WHERE
project_id NOT IN (
SELECT DISTINCT
STAND_ID
FROM
sar_stand_items sar_stand_items
)) )
)
<if test="qu != null"> <if test="qu != null">
<if test="qu.projectNumber != null"> <if test="qu.projectNumber != null">
AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
</if> </if>
<if test="qu.projectName != null"> <if test="qu.projectName != null">
AND project_name LIKE concat(concat('%',#{qu.projectName}),'%') AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
</if> </if>
<if test="qu.projectClassification != null"> <if test="qu.projectClassification != null">
AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%') AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
</if> </if>
<if test="qu.projectPlatfor != null"> <if test="qu.projectPlatfor != null">
AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%') AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
</if> </if>
<if test="qu.projectGroup != null"> <if test="qu.projectGroup != null">
AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
</if> </if>
<if test="qu.projectStatus != null"> <if test="qu.projectStatus != null">
AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
</if> </if>
<if test="qu.currentNode != null"> <if test="qu.currentNode != null">
AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%') AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
</if> </if>
<if test="qu.projectLevel != null"> <if test="qu.projectLevel != null">
AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%') AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
</if> </if>
<if test="qu.projectManager != null"> <if test="qu.projectManager != null">
AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%') AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
</if> </if>
<if test="qu.productLine != null"> <if test="qu.productLine != null">
AND product_line LIKE concat(concat('%',#{qu.productLine}),'%') AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
</if> </if>
<if test="qu.projectStartDate != null"> <if test="qu.projectStartDate != null">
AND project_start_date &gt;= #{qu.projectStartDate} AND library.project_start_date &gt;= #{qu.projectStartDate}
</if> </if>
<if test="qu.projectEndDate != null"> <if test="qu.projectEndDate != null">
AND project_end_date &lt;= #{qu.projectEndDate} AND library.project_end_date &lt;= #{qu.projectEndDate}
</if> </if>
</if> </if>
) )