Browse Source

硬核页面修改

feature/syp_points
zhangyongzhangyong 5 years ago
parent
commit
02619de3a5
  1. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/DeptInfoDTO.java
  2. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java
  3. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/dao/DeptInfoDao.java
  4. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/service/impl/DeptInfoServiceImpl.java
  5. 13
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/DeptInfoDTO.java

@ -82,4 +82,9 @@ public class DeptInfoDTO implements Serializable {
* 更新时间
*/
private Date updatedTime;
/**
* 排序字段
*/
private String sort;
}

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcDeptInfoResultDTO.java

@ -34,9 +34,4 @@ public class EpdcDeptInfoResultDTO implements Serializable {
* 部门电话
*/
private String mobile;
/**
* 排序字段
*/
private String sort;
}

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/dao/DeptInfoDao.java

@ -37,14 +37,14 @@ import java.util.Map;
public interface DeptInfoDao extends BaseDao<DeptInfoEntity> {
/**
* 根据部门id判断该部门是否已新增过
* 根据部门名称判断该部门是否已新增过
*
* @param deptId
* @param deptName
* @return int
* @Author zhangyong
* @Date 17:20 2020-05-19
**/
int getDeptIdCount(Long deptId);
int getDeptNameCount(String deptName);
/**
* 移动端获取 了解锦水-硬核管理接口

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/dept/service/impl/DeptInfoServiceImpl.java

@ -56,7 +56,6 @@ public class DeptInfoServiceImpl extends BaseServiceImpl<DeptInfoDao, DeptInfoEn
@Override
public PageData<DeptInfoDTO> page(Map<String, Object> params) {
params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
IPage<DeptInfoDTO> page = getPage(params);
List<DeptInfoDTO> list = baseDao.selectListDeptInfoPage(params);
return new PageData<>(list, page.getTotal());
@ -90,9 +89,10 @@ public class DeptInfoServiceImpl extends BaseServiceImpl<DeptInfoDao, DeptInfoEn
@Transactional(rollbackFor = Exception.class)
public Result save(DeptInfoDTO dto) {
DeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, DeptInfoEntity.class);
entity.setDeptName(entity.getDeptName().trim());
// 模块不能重复添加
int deptIdCount = baseDao.getDeptIdCount(entity.getDeptId());
if (deptIdCount > 0) {
int deptNameCount = baseDao.getDeptNameCount(entity.getDeptName());
if (deptNameCount > 0) {
return new Result().error("该部门已存在,不可重复新增");
}
insert(entity);

13
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/dept/DeptInfoDao.xml

@ -17,11 +17,11 @@
<result property="sort" column="SORT"/>
</resultMap>
<select id="getDeptIdCount" resultType="int">
<select id="getDeptNameCount" resultType="int">
SELECT
COUNT(1)
FROM epdc_dept_info
WHERE DEPT_ID = #{deptId}
WHERE DEPT_NAME = #{deptName}
AND DEL_FLAG = 0
</select>
@ -44,6 +44,7 @@
DEPT_NAME deptName,
DEPT_ID deptId,
MOBILE mobile,
SORT sort,
CREATED_TIME createdTime
FROM
epdc_dept_info
@ -51,12 +52,6 @@
<if test="deptName != null and deptName.trim() != ''">
AND instr(DEPT_NAME, trim(#{deptName})) > 0
</if>
<if test="deptIdList!=null and deptIdList.size()>0">
and DEPT_ID in
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</if>
ORDER BY CREATED_TIME DESC
ORDER BY SORT, CREATED_TIME DESC
</select>
</mapper>

Loading…
Cancel
Save