guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

若干bug修复

pull/12/head
liujun 2024-01-19 18:35:26 +08:00
parent 0bfd1d1d9d
commit 7d015ec138
5 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -78,7 +78,7 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("VALID_FLAG", "1"); x.put("VALID_FLAG", "1");
x.put("STATUS", "1"); x.put("STATUS", "1");
x.put("CHECK_STATUS", "0"); x.put("CHECK_STATUS", "0");
x.put("CHECK_STEP", 1); x.put("CHECK_STEP", 0);
x.put("CREATED_TIME", DateUtil.getTime()); x.put("CREATED_TIME", DateUtil.getTime());
x.put("OPERATOR_TIME", DateUtil.getTime()); x.put("OPERATOR_TIME", DateUtil.getTime());
x.put("IS_DELETE", "0"); x.put("IS_DELETE", "0");
@ -126,7 +126,7 @@ public class XgfUserServiceImpl implements XgfUserService {
x.put("VALID_FLAG", "1"); x.put("VALID_FLAG", "1");
x.put("STATUS", "1"); x.put("STATUS", "1");
x.put("CHECK_STATUS", "0"); x.put("CHECK_STATUS", "0");
x.put("CHECK_STEP", 1); x.put("CHECK_STEP", 0);
if ("2".equals(x.getString("STUDY_STATUS"))) { if ("2".equals(x.getString("STUDY_STATUS"))) {
x.put("STUDY_STATUS", "2"); x.put("STUDY_STATUS", "2");
} else { } else {
@ -144,34 +144,25 @@ public class XgfUserServiceImpl implements XgfUserService {
if (flows == null || flows.size() <= 0) { if (flows == null || flows.size() <= 0) {
flows = new PageData(); flows = new PageData();
flows.put("FLOWS_ID", x.getString("USER_ID")); flows.put("FLOWS_ID", x.getString("USER_ID"));
flows.put("FLOWS_STEP", 1); flows.put("FLOWS_STEP", 0);
flows.put("FOREIGN_KEY_ID", x.getString("USER_ID")); flows.put("FOREIGN_KEY_ID", x.getString("USER_ID"));
flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID"); flows.put("FOREIGN_KEY_NAME", "xgf_user=>XGF_USER_ID");
flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); flows.put("IS_DELETE", "0");
condition.clear(); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID"));
condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME"));
PageData corpInfo = corpInfoMapper.findById(condition); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID"));
if (corpInfo != null && corpInfo.size() > 0) { flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME"));
flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID"));
} flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME"));
flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID"));
flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME"));
flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID"));
flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME"));
xgfFlowsMapper.save(flows); xgfFlowsMapper.save(flows);
} else { } else {
flows.put("APPOINT_ZERO_CORP_ID", x.getString("CORPINFO_ID")); flows.put("FLOWS_STEP", 0);
flows.put("FLOWS_STEP", 1); flows.put("APPOINT_ZERO_CORP_NAME", x.getString("APPOINT_CORP_NAME"));
condition.clear(); flows.put("APPOINT_ZERO_CORP_ID", x.getString("APPOINT_CORP_ID"));
condition.put("CORPINFO_ID", x.getString("CORPINFO_ID")); flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_DEPARTMENT_ID"));
PageData corpInfo = corpInfoMapper.findById(condition); flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_DEPARTMENT_NAME"));
if (corpInfo != null && corpInfo.size() > 0) { flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_USER_ID"));
flows.put("APPOINT_ZERO_CORP_NAME", corpInfo.getString("NAME")); flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_USER_NAME"));
}
flows.put("APPOINT_ZERO_DEPARTMENT_ID", x.getString("APPOINT_ZERO_DEPARTMENT_ID"));
flows.put("APPOINT_ZERO_DEPARTMENT_NAME", x.getString("APPOINT_ZERO_DEPARTMENT_NAME"));
flows.put("APPOINT_ZERO_USER_ID", x.getString("APPOINT_ZERO_USER_ID"));
flows.put("APPOINT_ZERO_USER_NAME", x.getString("APPOINT_ZERO_USER_NAME"));
xgfFlowsMapper.edit(flows); xgfFlowsMapper.edit(flows);
} }
/* 3、流程记录 */ /* 3、流程记录 */
@ -372,6 +363,19 @@ public class XgfUserServiceImpl implements XgfUserService {
void handle(PageData info, PageData flows) throws Exception{ void handle(PageData info, PageData flows) throws Exception{
switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) { switch (Integer.parseInt(flows.get("FLOWS_STEP").toString())) {
case 0:
flows.put("APPOINT_ZERO_CORP_ID", info.getString("APPOINT_CORP_ID"));
flows.put("APPOINT_ZERO_CORP_NAME", info.getString("APPOINT_CORP_NAME"));
flows.put("APPOINT_ZERO_DEPARTMENT_ID", info.getString("APPOINT_DEPARTMENT_ID"));
flows.put("APPOINT_ZERO_DEPARTMENT_NAME", info.getString("APPOINT_DEPARTMENT_NAME"));
flows.put("APPOINT_ZERO_USER_ID", info.getString("APPOINT_USER_ID"));
flows.put("APPOINT_ZERO_USER_NAME", info.getString("APPOINT_USER_NAME"));
flows.put("APPOINT_ZERO_TIME", DateUtil.getTime());
flows.put("APPOINT_ZERO_STATUS", info.getString("STATUS"));
flows.put("APPOINT_ZERO_OPINION", info.getString("OPINION"));
flows.put("FLOWS_STEP", 1);
xgfFlowsMapper.edit(flows);
break;
case 1: case 1:
flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID")); flows.put("APPOINT_ONE_CORP_ID", info.getString("APPOINT_CORP_ID"));
flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME")); flows.put("APPOINT_ONE_CORP_NAME", info.getString("APPOINT_CORP_NAME"));

16
src/main/resources/mybatis/datasource/xgf/FlowDetailMapper.xml
View File

@ -28,7 +28,8 @@
f.END_FLAG, f.END_FLAG,
f.ISDELETE, f.ISDELETE,
f.PARENT_ID, f.PARENT_ID,
f.FOREIGN_KEY f.FOREIGN_KEY,
f.SORT
</sql> </sql>
<!-- 字段用于新增 --> <!-- 字段用于新增 -->
@ -47,7 +48,8 @@
END_FLAG, END_FLAG,
ISDELETE, ISDELETE,
PARENT_ID, PARENT_ID,
FOREIGN_KEY FOREIGN_KEY,
SORT
</sql> </sql>
<!-- 字段值 --> <!-- 字段值 -->
@ -66,7 +68,8 @@
#{END_FLAG}, #{END_FLAG},
#{ISDELETE}, #{ISDELETE},
#{PARENT_ID}, #{PARENT_ID},
#{FOREIGN_KEY} #{FOREIGN_KEY},
#{SORT}
</sql> </sql>
<!-- 新增--> <!-- 新增-->
@ -104,8 +107,9 @@
END_FLAG = #{END_FLAG}, END_FLAG = #{END_FLAG},
ISDELETE = #{ISDELETE}, ISDELETE = #{ISDELETE},
PARENT_ID = #{PARENT_ID}, PARENT_ID = #{PARENT_ID},
FOREIGN_ID = #{FOREIGN_ID}, FOREIGN_KEY = #{FOREIGN_KEY},
STEP_NAME = #{STEP_NAME}, STEP_NAME = #{STEP_NAME},
SORT = #{SORT}
where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID} where FLOW_DETAIL_ID = #{FLOW_DETAIL_ID}
</update> </update>
@ -125,8 +129,8 @@
<if test="PARENT_ID != null and PARENT_ID != ''"> <if test="PARENT_ID != null and PARENT_ID != ''">
and a.PARENT_ID = #{PARENT_ID} and a.PARENT_ID = #{PARENT_ID}
</if> </if>
<if test="FOREIGN_ID != null and FOREIGN_ID != ''"> <if test="FOREIGN_KEY != null and FOREIGN_KEY != ''">
and a.FOREIGN_ID = #{FOREIGN_ID} and a.FOREIGN_KEY = #{FOREIGN_KEY}
</if> </if>
</select> </select>
</mapper> </mapper>

10
src/main/resources/mybatis/datasource/xgf/FlowMapper.xml
View File

@ -20,7 +20,8 @@
f.CREATOR_NAME, f.CREATOR_NAME,
f.CREATOR_TIME, f.CREATOR_TIME,
f.VALID_FLAG, f.VALID_FLAG,
f.FOREIGN_KEY f.FOREIGN_KEY,
f.ISDELETE
</sql> </sql>
<!-- 字段用于新增 --> <!-- 字段用于新增 -->
@ -31,7 +32,8 @@
CREATOR_NAME, CREATOR_NAME,
CREATOR_TIME, CREATOR_TIME,
VALID_FLAG, VALID_FLAG,
FOREIGN_KEY FOREIGN_KEY,
ISDELETE
</sql> </sql>
<!-- 字段值 --> <!-- 字段值 -->
@ -42,7 +44,8 @@
#{CREATOR_NAME}, #{CREATOR_NAME},
#{CREATOR_TIME}, #{CREATOR_TIME},
#{VALID_FLAG}, #{VALID_FLAG},
#{FOREIGN_KEY} #{FOREIGN_KEY},
#{ISDELETE}
</sql> </sql>
<!-- 新增--> <!-- 新增-->
@ -74,6 +77,7 @@
CREATOR_NAME = #{CREATOR_NAME}, CREATOR_NAME = #{CREATOR_NAME},
CREATOR_TIME = #{CREATOR_TIME}, CREATOR_TIME = #{CREATOR_TIME},
VALID_FLAG = #{VALID_FLAG}, VALID_FLAG = #{VALID_FLAG},
ISDELETE = #{ISDELETE},
FOREIGN_KEY = FOREIGN_KEY FOREIGN_KEY = FOREIGN_KEY
where where
FLOW_ID = #{FLOW_ID} FLOW_ID = #{FLOW_ID}

4
src/main/resources/mybatis/datasource/xgf/XgfFlowsMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.XgfFlowsMapper"> <mapper namespace="com.zcloud.mapper.datasource.xgf.XgfFlowsMapper">
<sql id="tableName"> <sql id="tableName">
xgf_flows xgf_flows
@ -320,7 +320,7 @@
APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME}, APPOINT_SEVEN_USER_NAME = #{APPOINT_SEVEN_USER_NAME},
APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS}, APPOINT_SEVEN_STATUS = #{APPOINT_SEVEN_STATUS},
APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION} APPOINT_SEVEN_OPINION = #{APPOINT_SEVEN_OPINION}
where a.FLOWS_ID = #{FLOWS_ID} where FLOWS_ID = #{FLOWS_ID}
</update> </update>
<!-- 分页查询 --> <!-- 分页查询 -->

4
src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
View File

@ -325,11 +325,13 @@
a.BELONG_TO_CORP_NAME, a.BELONG_TO_CORP_NAME,
a.USERNAME, a.USERNAME,
a.NAME, a.NAME,
a.CHECK_STEP,
c.* c.*
from xgf_user a from xgf_user a
left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID left join xgf_flows c on a.XGF_USER_ID = c.FLOWS_ID
where a.IS_DELETE = '0' where a.IS_DELETE = '0'
and (c.APPOINT_ONE_USER_ID = #{pd.USER_ID} and (c.APPOINT_ZERO_USER_ID = #{pd.USER_ID}
or c.APPOINT_ONE_USER_ID = #{pd.USER_ID}
or c.APPOINT_TWO_USER_ID = #{pd.USER_ID} or c.APPOINT_TWO_USER_ID = #{pd.USER_ID}
or c.APPOINT_THREE_USER_ID = #{pd.USER_ID} or c.APPOINT_THREE_USER_ID = #{pd.USER_ID}
or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID} or c.APPOINT_FOUR_USER_ID = #{pd.USER_ID}