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

bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-02-24 17:55:22 +08:00
parent 7c271fa204
commit af11a626df
7 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+2
View File
@@ -58,6 +58,8 @@ public class ActDefineStartMap {
map.put("24","Aboliish"); map.put("24","Aboliish");
map.put("25","enterpriseStandardSystemRevisionPlan"); map.put("25","enterpriseStandardSystemRevisionPlan");
map.put("26","qbzxdlxjh");
return map.get(type); return map.get(type);
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
+1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandIdea.entity; package com.adc.da.slrs.sarStandIdea.entity;
import com.adc.da.base.entity.BaseEntity; import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+10 -4
View File
@@ -106,10 +106,16 @@ public class FieldConvertUtil {
if (StringUtils.isNotBlank(timeStr)) { if (StringUtils.isNotBlank(timeStr)) {
List<String> timeList = Arrays.asList(timeStr.split(",")); List<String> timeList = Arrays.asList(timeStr.split(","));
List<String> collect;
List<String> collect = timeList.stream() if (timeStr.length()<=10) {
.map(item -> "str_to_date('" + item + "','%Y-%m-%d')") collect = timeList.stream()
.collect(Collectors.toList()); .map(item -> "str_to_date('" + item + "','%Y-%m-%d')")
.collect(Collectors.toList());
}else {
collect = timeList.stream()
.map(item -> "str_to_date('" + item.substring(0,10) + "','%Y-%m-%d ')")
.collect(Collectors.toList());
}
timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; timeStr ="concat(" + String.join(", \',\' ,", collect) + ")";
} else { } else {
timeStr = "null"; timeStr = "null";
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+1 -1
View File
@@ -31,7 +31,7 @@
b.NYLX LIKE concat ('%',#{sarFindDto.nylx,jdbcType=VARCHAR},'%') b.NYLX LIKE concat ('%',#{sarFindDto.nylx,jdbcType=VARCHAR},'%')
and and
</if> </if>
<if test="sarFindDto.ZRBM != null"> <if test="sarFindDto.zrbm != null">
b.ZRBM LIKE concat ('%',#{sarFindDto.zrbm,jdbcType=VARCHAR},'%') b.ZRBM LIKE concat ('%',#{sarFindDto.zrbm,jdbcType=VARCHAR},'%')
and and
</if> </if>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+33 -12
View File
@@ -15,16 +15,35 @@
</select> </select>
<select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll"> <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag, <!--SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,-->
sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name, <!--sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,-->
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName, <!--sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName,-->
sar_public_idea_all.cause <!--sar_public_idea_all.cause-->
FROM sar_public_idea_all <!--FROM sar_public_idea_all-->
left join ts_user on sar_public_idea_all.user_id=ts_user.USID <!--left join ts_user on sar_public_idea_all.user_id=ts_user.USID-->
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID <!--left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID-->
WHERE <!--WHERE-->
sar_public_idea_all.idea_id = #{ideaId} <!--sar_public_idea_all.idea_id = #{ideaId}-->
LIMIT ${(page-1)*size},${size} <!--LIMIT ${(page-1)*size},${size}-->
<!---->
SELECT
c.*
FROM
(
SELECT (@i:=@i+1) as rows,
sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,
sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,
sar_public_idea_all.part_code,sar_public_idea_all.user_name,
sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.cause
FROM (sar_public_idea_all,(SELECT @i:=0)j)
left join ts_user on sar_public_idea_all.user_id=ts_user.USID
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
WHERE
sar_public_idea_all.idea_id = #{ideaId}
LIMIT ${(page-1)*size},${size}
)c
ORDER BY CONVERT(SUBSTRING(c.part_code,1,(SELECT LOCATE('.',CONCAT(c.part_code,'.')))),SIGNED) ,c.rows
</select> </select>
<select id="getAllDataByIdeaCount" resultType="java.lang.Integer"> <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
@@ -34,7 +53,8 @@
</select> </select>
<select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll"> <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause SELECT sar_public_idea_all.id,reason,ts_institution.name as
deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
FROM sar_public_idea_all FROM sar_public_idea_all
left join ts_user on ts_user.USID=sar_public_idea_all.user_id left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -46,7 +66,8 @@
</select> </select>
<select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll"> <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause SELECT sar_public_idea_all.id,reason,ts_institution.name as
deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
FROM sar_public_idea_all FROM sar_public_idea_all
left join ts_user on ts_user.USID=sar_public_idea_all.user_id left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+9 -9
View File
@@ -12,7 +12,7 @@
<result column="ISSUE_TIME" property="issueTime"></result> <result column="ISSUE_TIME" property="issueTime"></result>
<result column="APPLY_TYPE" property="applyType"></result> <result column="APPLY_TYPE" property="applyType"></result>
<result column="DUTY_ENGINEER" property="dutyEngineer"></result> <result column="DUTY_ENGINEER" property="dutyEngineer"></result>
<result column="ITEMS_ID" property="itemsId"></result> <result column="ITEM_ID" property="itemsId"></result>
<result column="ITEMS_NUM" property="itemsNum"></result> <result column="ITEMS_NUM" property="itemsNum"></result>
<result column="ITEMS_NAME" property="itemsName"></result> <result column="ITEMS_NAME" property="itemsName"></result>
<result column="TERMS_CONDITIONS" property="termsConditions"></result> <result column="TERMS_CONDITIONS" property="termsConditions"></result>
@@ -102,7 +102,7 @@
dicType.DIC_TYPE_NAME AS applyTypeShow, dicType.DIC_TYPE_NAME AS applyTypeShow,
attr.CLLX AS APPLY_TYPE , attr.CLLX AS APPLY_TYPE ,
attr.ZRGCS AS DUTY_ENGINEER , attr.ZRGCS AS DUTY_ENGINEER ,
NULL AS ITEMS_ID , NULL AS ITEM_ID ,
NULL AS ITEMS_NUM , NULL AS ITEMS_NUM ,
NULL AS ITEMS_NAME , NULL AS ITEMS_NAME ,
NULL AS TERMS_CONDITIONS, NULL AS TERMS_CONDITIONS,
@@ -140,7 +140,7 @@
dicType.DIC_TYPE_NAME AS applyTypeShow, dicType.DIC_TYPE_NAME AS applyTypeShow,
items.APPLY_ARCTIC AS APPLY_TYPE , items.APPLY_ARCTIC AS APPLY_TYPE ,
items.DUTY_ENGINEER AS DUTY_ENGINEER , items.DUTY_ENGINEER AS DUTY_ENGINEER ,
items.ID AS ITEMS_ID , items.ID AS ITEM_ID ,
items.ITEMS_NUM , items.ITEMS_NUM ,
items.ITEMS_NAME , items.ITEMS_NAME ,
items.TERMS_CONDITIONS, items.TERMS_CONDITIONS,
@@ -153,7 +153,7 @@
FROM FROM
sar_stand_warning AS warning sar_stand_warning AS warning
LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '') LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '')
<where> <where>
@@ -179,7 +179,7 @@
GROUP BY warning_date.law_id,item_id GROUP BY warning_date.law_id,item_id
) warning_date ) warning_date
ON warning_date.law_id = WARNING_RESULT.STAND_ID ON warning_date.law_id = WARNING_RESULT.STAND_ID
AND warning_date.item_id = WARNING_RESULT.ITEMS_ID AND warning_date.item_id = WARNING_RESULT.ITEM_ID
ORDER BY warning_date.SSRQ_MIN ORDER BY warning_date.SSRQ_MIN
@@ -198,7 +198,7 @@
APPLY_TYPE , APPLY_TYPE ,
attr attr
.ZRGCS AS DUTY_ENGINEER , .ZRGCS AS DUTY_ENGINEER ,
ITEMS_ID , ITEM_ID ,
NULL AS ITEMS_NUM , NULL AS ITEMS_NUM ,
NULL AS ITEMS_NAME , NULL AS ITEMS_NAME ,
NULL AS TERMS_CONDITIONS, NULL AS TERMS_CONDITIONS,
@@ -242,7 +242,7 @@
<include refid="stand_column"/> , <include refid="stand_column"/> ,
items.APPLY_ARCTIC AS APPLY_TYPE , items.APPLY_ARCTIC AS APPLY_TYPE ,
items.DUTY_ENGINEER AS DUTY_ENGINEER , items.DUTY_ENGINEER AS DUTY_ENGINEER ,
items.ID AS ITEMS_ID , items.ID AS ITEM_ID ,
items.ITEMS_NUM , items.ITEMS_NUM ,
items.ITEMS_NAME , items.ITEMS_NAME ,
items.TERMS_CONDITIONS, items.TERMS_CONDITIONS,
@@ -256,7 +256,7 @@
sar_stand_warning AS warning sar_stand_warning AS warning
LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
<where> <where>
POWER = '1' POWER = '1'
AND (MARK = 'item') AND (MARK = 'item')
@@ -289,7 +289,7 @@
GROUP BY warning_date.law_id,item_id GROUP BY warning_date.law_id,item_id
) warning_date ) warning_date
ON warning_date.law_id = WARNING_RESULT.STAND_ID ON warning_date.law_id = WARNING_RESULT.STAND_ID
AND warning_date.item_id = WARNING_RESULT.ITEMS_ID AND warning_date.item_id = WARNING_RESULT.ITEM_ID
ORDER BY warning_date.SSRQ_MIN ORDER BY warning_date.SSRQ_MIN
</select> </select>
adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
+1 -1
View File
@@ -404,7 +404,7 @@
where collect_type=#{c} where collect_type=#{c}
</select> </select>
<select id="countPersonCollectByStandInfo" resultType="java.lang.Integer"> <select id="countPersonCollectByStandInfo" resultType="java.lang.Integer">
SELECT COUNT(1) SELECT COUNT(ts_person_collect.ID)
from from
ts_person_collect ts_person_collect
WHERE WHERE