DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 组织管理 删除id 用org_code

Browse Source
This commit is contained in:
bupengxiang
2023-05-09 11:00:44 +08:00
parent 89b48fd62b
commit 8df19abcef
20 changed files with 103 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java
+3
View File
@@ -124,4 +124,7 @@ public class TtReportManageAct {
@TableField(exist = false)
private List<String> labelList;
@TableField(exist = false)
private List<LabelEntity> labelEOList;
}
adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<result column="del_flag" property="delFlag" />
<result column="secrecy_last" property="secrecyLast" />
<result column="file_name" property="fileName" />
<collection property="labelList" ofType="com.adc.da.report.eo.LabelEntity">
<collection property="labelEOList" ofType="com.adc.da.report.eo.LabelEntity">
<id column="lableId" property="id"/>
<result column="lableName" property="name"/>
</collection>
adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class
BIN
View File
Binary file not shown.
adc-da-report/target/classes/mybatis/mapper/mysql/TtReportManageActMapper.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<result column="del_flag" property="delFlag" />
<result column="secrecy_last" property="secrecyLast" />
<result column="file_name" property="fileName" />
<collection property="labelList" ofType="com.adc.da.report.eo.LabelEntity">
<collection property="labelEOList" ofType="com.adc.da.report.eo.LabelEntity">
<id column="lableId" property="id"/>
<result column="lableName" property="name"/>
</collection>
adc-da-sys/src/main/java/com/adc/da/sys/controller/OrgEOController.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class OrgEOController extends BaseController<OrgEO> {
String currentDateTimeString = dateTime.format(formatter);
orgEO.setUpdateTime(currentDateTimeString);
orgEO.setStatus(1);
return Result.success(orgEOService.saveOrUpdate(orgEO));
return orgEOService.saveOrUpdateSingleton(orgEO);
}
/**
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/OrgEODao.java
+2
View File
@@ -15,4 +15,6 @@ public interface OrgEODao extends BaseMapper<OrgEO> {
List<OrgEO> selectListByVO(@Param("pageVO")OrgEO orgEO);
IPage<OrgEO> selectPageByVO(Page<OrgEO> page,@Param("pageVO")OrgEOPage orgEOPage);
long selectCountByUUID(@Param("pageVO")OrgEO orgEO);
}
adc-da-sys/src/main/java/com/adc/da/sys/entity/OrgEO.java
+7 -6
View File
@@ -1,9 +1,7 @@
package com.adc.da.sys.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -18,15 +16,18 @@ public class OrgEO extends BaseEntity implements Serializable {
private static final long serialVersionUID = -2386892031753294731L;
@TableId(value = "ID",type = IdType.UUID)
private String id;
/**
* 部门编码
*/
@TableField("ORG_CODE")
@TableField("org_code")
private String orgCode;
/**
* 唯一值
*/
@TableField("UUID")
private String UUID;
/**
* 部门名称
*/
adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java
+5 -3
View File
@@ -9,14 +9,16 @@ import java.util.Date;
public class OrgEOPage extends BasePage {
private static final long serialVersionUID = -2386892031753294731L;
private String id;
/**
* 部门编码
*/
private String orgCode;
/**
* 唯一值
*/
private String UUID;
/**
* 部门名称
*/
adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java
+28 -1
View File
@@ -5,6 +5,9 @@ import com.adc.da.sys.dao.mysql.UserOrgEODao;
import com.adc.da.sys.entity.OrgEO;
import com.adc.da.sys.page.OrgEOPage;
import com.adc.da.sys.service.iservice.IOrgEoService;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.adc.da.util.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.UUID;
@Service("orgEOService")
@Transactional
@@ -33,7 +37,7 @@ public class OrgEOService extends ServiceImpl<OrgEODao, OrgEO> implements IOrgEo
OrgEO orgEO = new OrgEO();
orgEO.setStatus(-1);
QueryWrapper<OrgEO> orgEOQueryWrapper = new QueryWrapper<>();
orgEOQueryWrapper.in("ID",idArray);
orgEOQueryWrapper.in("org_code",idArray);
baseMapper.update(orgEO,orgEOQueryWrapper);
}
@@ -49,4 +53,27 @@ public class OrgEOService extends ServiceImpl<OrgEODao, OrgEO> implements IOrgEo
IPage<OrgEO> orgEOIPage = baseMapper.selectPageByVO(page,orgEOPage);
return orgEOIPage;
}
/**
* 新增或修改 部门编码不能重复
* @param orgEO
* @return
*/
public ResponseMessage saveOrUpdateSingleton(OrgEO orgEO) {
if (StringUtils.isEmpty(orgEO.getOrgCode())){
return Result.error("部门编码不能为空");
}
long count = baseMapper.selectCountByUUID(orgEO);
if(count>0){
return Result.error("部门编码重复");
}
if(StringUtils.isBlank(orgEO.getUUID())){
String uuid = UUID.randomUUID().toString().replace("-", "");
orgEO.setUUID(uuid);
baseMapper.insert(orgEO);
}else{
baseMapper.updateById(orgEO);
}
return Result.success();
}
}
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/OrgEOMapper.xml
+15 -4
View File
@@ -4,11 +4,11 @@
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
<if test="pageVO.id != null and pageVO.id !=''">
and id = #{pageVO.id}
<if test="pageVO.orgCode != null and pageVO.orgCode !=''">
and org_code = #{pageVO.orgCode}
</if>
<if test="pageVO.orgCode != null and pageVO.orgCode != ''">
and ORG_CODE = #{pageVO.orgCode}
<if test="pageVO.UUID != null and pageVO.UUID != ''">
and UUID = #{pageVO.UUID}
</if>
<if test="pageVO.orgName != null and pageVO.orgName != ''">
and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%')
@@ -45,4 +45,15 @@
<include refid="Base_Where_Clause"/>
</where>
</select>
<select id="selectCountByUUID" resultType="java.lang.Long">
select count(1) from TS_ORG
<where>
<if test="pageVO.UUID != null and pageVO.UUID != ''">
and UUID != #{pageVO.UUID}
</if>
<if test="pageVO.orgCode != null and pageVO.orgCode != ''">
and org_code = #{pageVO.orgCode}
</if>
</where>
</select>
</mapper>
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+11 -11
View File
@@ -58,7 +58,7 @@
<result column="remarks" property="remarks"/>
</collection>
<collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
<id column="id" property="id"/>
<id column="id" property="orgCode"/>
<result column="org_name" property="orgName"/>
</collection>
</resultMap>
@@ -103,13 +103,13 @@
r.is_default as isDefault,
r.name as name,
r.remarks as remarks,
org.id as orgId,
org.org_code as orgId,
org.org_name
from TS_USER u
left join TR_USER_ROLE ur on u.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_org uo on u.usid = uo.user_id
left join TS_org org on uo.org_id = org.id and org.status = 1
left join TS_org org on uo.org_id = org.org_code and org.status = 1
where u.usid = #{id}
</select>
@@ -160,7 +160,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -169,7 +169,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.del_flag != 1
and users.usid in
<foreach collection="userIdList" item="id" open="(" separator="," close=")">
@@ -186,7 +186,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -195,7 +195,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.del_flag != 1
and users.usid=#{usid}
</select>
@@ -209,7 +209,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -218,7 +218,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.usid=#{usid}
</select>
@@ -233,7 +233,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -242,7 +242,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.usid in
<foreach collection="userIdList" item="id" open="(" separator="," close=")">
#{id}
adc-da-sys/target/classes/com/adc/da/sys/controller/OrgEOController.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/dao/mysql/OrgEODao.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/entity/OrgEO.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/page/OrgEOPage.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/com/adc/da/sys/service/OrgEOService.class
BIN
View File
Binary file not shown.
adc-da-sys/target/classes/mybatis/mapper/sys/mysql/OrgEOMapper.xml
+15 -4
View File
@@ -4,11 +4,11 @@
<!-- 查询条件 -->
<sql id="Base_Where_Clause">
<if test="pageVO.id != null and pageVO.id !=''">
and id = #{pageVO.id}
<if test="pageVO.orgCode != null and pageVO.orgCode !=''">
and org_code = #{pageVO.orgCode}
</if>
<if test="pageVO.orgCode != null and pageVO.orgCode != ''">
and ORG_CODE = #{pageVO.orgCode}
<if test="pageVO.UUID != null and pageVO.UUID != ''">
and UUID = #{pageVO.UUID}
</if>
<if test="pageVO.orgName != null and pageVO.orgName != ''">
and ORG_NAME LIKE CONCAT(CONCAT('%',#{pageVO.orgName}) ,'%')
@@ -45,4 +45,15 @@
<include refid="Base_Where_Clause"/>
</where>
</select>
<select id="selectCountByUUID" resultType="java.lang.Long">
select count(1) from TS_ORG
<where>
<if test="pageVO.UUID != null and pageVO.UUID != ''">
and UUID != #{pageVO.UUID}
</if>
<if test="pageVO.orgCode != null and pageVO.orgCode != ''">
and org_code = #{pageVO.orgCode}
</if>
</where>
</select>
</mapper>
adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml
+11 -11
View File
@@ -58,7 +58,7 @@
<result column="remarks" property="remarks"/>
</collection>
<collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
<id column="id" property="id"/>
<id column="id" property="orgCode"/>
<result column="org_name" property="orgName"/>
</collection>
</resultMap>
@@ -103,13 +103,13 @@
r.is_default as isDefault,
r.name as name,
r.remarks as remarks,
org.id as orgId,
org.org_code as orgId,
org.org_name
from TS_USER u
left join TR_USER_ROLE ur on u.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_org uo on u.usid = uo.user_id
left join TS_org org on uo.org_id = org.id and org.status = 1
left join TS_org org on uo.org_id = org.org_code and org.status = 1
where u.usid = #{id}
</select>
@@ -160,7 +160,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -169,7 +169,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.del_flag != 1
and users.usid in
<foreach collection="userIdList" item="id" open="(" separator="," close=")">
@@ -186,7 +186,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -195,7 +195,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.del_flag != 1
and users.usid=#{usid}
</select>
@@ -209,7 +209,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -218,7 +218,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.usid=#{usid}
</select>
@@ -233,7 +233,7 @@
r.del_flag as r_delFlag,
r.is_default as r_is_default,
r.name as r_name,
o.id as o_id,
o.org_code as o_id,
o.org_code as o_org_code,
o.org_name as o_org_name,
o.sup_org_code as o_sup_org_code,
@@ -242,7 +242,7 @@
left join TR_USER_ROLE ur on users.usid = ur.user_id
left join TS_ROLE r on ur.role_id = r.id
left join TR_USER_ORG uo on users.usid = uo.user_id
left join TS_ORG o on uo.org_id = o.id
left join TS_ORG o on uo.org_id = o.org_code
where users.usid in
<foreach collection="userIdList" item="id" open="(" separator="," close=")">
#{id}
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java
+3 -3
View File
@@ -153,9 +153,9 @@ public class ActivitDefineController {
String id = jsonObject.getString("id");
String userId = jsonObject.getString("loginUserId");
String bpnId = jsonObject.getString("bpnId");
String reportId = jsonObject.getString("reportId");
Object dataMsg = jsonObject.get("dataMsg");
Object approveData =jsonObject.get("approveData");
// String reportId = jsonObject.getString("reportId");
// Object dataMsg = jsonObject.get("dataMsg");
// Object approveData =jsonObject.get("approveData");
// 创建查询对象
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery();
report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class
BIN
View File
Binary file not shown.