提交小程序代码
姜玉琦
parent
91def538e9
commit
d8460bad45
|
|
@ -129,6 +129,17 @@ public interface PshMapper {
|
|||
*/
|
||||
public int updateState(Map<String, Object> map);
|
||||
|
||||
/**
|
||||
* @describe:修改状态
|
||||
* @author:
|
||||
* @date:2021/4/2&11:28
|
||||
* @version:V1.0
|
||||
* @param:
|
||||
* @return:
|
||||
* @Exception:
|
||||
*/
|
||||
public int updateStateOk(Map<String, Object> map);
|
||||
|
||||
/**
|
||||
* @describe:查询已整改的基本信息
|
||||
* @author:
|
||||
|
|
|
|||
|
|
@ -3,11 +3,13 @@ package com.ruoyi.web.pshManage.service;
|
|||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.ruoyi.common.config.RuoYiConfig;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
import com.ruoyi.common.enums.DeptTypeEnum;
|
||||
import com.ruoyi.common.enums.SysRoleEnum;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.QiniuBase64UploadUtil;
|
||||
import com.ruoyi.common.utils.file.FileUploadUtils;
|
||||
import com.ruoyi.system.mapper.SysRoleMapper;
|
||||
import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper;
|
||||
import com.ruoyi.web.pshManage.mapper.PshMapper;
|
||||
import com.ruoyi.web.sspMarks.domain.ProcessName;
|
||||
import com.ruoyi.web.userLogin.mapper.WxUserLoginMapper;
|
||||
|
|
@ -39,6 +41,9 @@ public class PshServiceImpl implements IPshService {
|
|||
@Autowired
|
||||
private SysRoleMapper sysRoleMapper;
|
||||
|
||||
@Autowired
|
||||
private WxProjectInfoMapper wxProjectInfoMapper;
|
||||
|
||||
|
||||
/**
|
||||
* @describe:查询随手拍信息的列表(问题整改)
|
||||
|
|
@ -136,15 +141,22 @@ public class PshServiceImpl implements IPshService {
|
|||
Map<String, Object> updateMap = new HashMap<>();
|
||||
Map<String, Object> dataMap = new HashMap<>();
|
||||
dataMap.put("loginName",map.get("createUser"));
|
||||
Map<String,Object> userMap = wxUserLoginMapper.checkLoginNameAndPsw(dataMap);
|
||||
//当前登录账号角色信息
|
||||
String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(userMap.get("user_id"))));
|
||||
//当前角色时管理员时，修改角色为集团公司
|
||||
if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){
|
||||
nowRole = SysRoleEnum.JTGS.getCode();
|
||||
}
|
||||
map.put("roleType",nowRole);
|
||||
//问题整改
|
||||
Map<String,Object> deptMap = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("createUser")));
|
||||
//当前角色时管理员时，修改角色为集团公司
|
||||
String roleType = "";
|
||||
if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){
|
||||
roleType = DeptTypeEnum.JTGSTYPE.getCode();
|
||||
}else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){
|
||||
roleType = DeptTypeEnum.ZGSTYPE.getCode();
|
||||
}else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){
|
||||
roleType = DeptTypeEnum.JLDWTYPE.getCode();
|
||||
}else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){
|
||||
roleType = DeptTypeEnum.ZBDWTYPE.getCode();
|
||||
}else if(DeptTypeEnum.FBDW.getCode().equals(deptMap.get("type_flag"))){
|
||||
roleType = DeptTypeEnum.FBDWTYPE.getCode();
|
||||
}
|
||||
map.put("roleType",roleType);
|
||||
/**
|
||||
* 基本信息入库
|
||||
* 图片 视频入库
|
||||
|
|
@ -411,7 +423,7 @@ public class PshServiceImpl implements IPshService {
|
|||
map.put("fieldName", "checkState");
|
||||
map.put("checkState", map.get("checkState"));
|
||||
map.put("keySet", "id");
|
||||
code = pshMapper.updateState(map);
|
||||
code = pshMapper.updateStateOk(map);
|
||||
//添加通过意见
|
||||
Map<String, Object> rejectMap = new HashMap<>(16);
|
||||
rejectMap.put("mainId", map.get("id"));
|
||||
|
|
|
|||
|
|
@ -129,6 +129,17 @@ public interface SspMapper {
|
|||
*/
|
||||
public int updateState(Map<String, Object> map);
|
||||
|
||||
/**
|
||||
* @describe:修改状态
|
||||
* @author:
|
||||
* @date:2021/4/2&11:28
|
||||
* @version:V1.0
|
||||
* @param:
|
||||
* @return:
|
||||
* @Exception:
|
||||
*/
|
||||
public int updateStateOk(Map<String, Object> map);
|
||||
|
||||
/**
|
||||
* @describe:查询已整改的基本信息
|
||||
* @author:
|
||||
|
|
|
|||
|
|
@ -468,7 +468,7 @@ public class SspServiceImpl implements ISspService {
|
|||
map.put("fieldName", "checkState");
|
||||
map.put("checkState", map.get("checkState"));
|
||||
map.put("keySet", "id");
|
||||
code = sspMapper.updateState(map);
|
||||
code = sspMapper.updateStateOk(map);
|
||||
//添加通过意见
|
||||
Map<String, Object> rejectMap = new HashMap<>(16);
|
||||
rejectMap.put("mainId", map.get("id"));
|
||||
|
|
|
|||
|
|
@ -314,6 +314,10 @@
|
|||
UPDATE ${tableName} SET ${fieldName} = #{checkState} WHERE ${keySet} = #{id}
|
||||
</update>
|
||||
|
||||
<update id="updateStateOk" parameterType="map">
|
||||
UPDATE ${tableName} SET ${fieldName} = #{checkState},updateTime = NOW() WHERE ${keySet} = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 查询已整改的基本信息 -->
|
||||
<select id="queryOpinion" parameterType="map" resultType="map">
|
||||
SELECT
|
||||
|
|
|
|||
|
|
@ -314,6 +314,10 @@
|
|||
UPDATE ${tableName} SET ${fieldName} = #{checkState} WHERE ${keySet} = #{id}
|
||||
</update>
|
||||
|
||||
<update id="updateStateOk" parameterType="map">
|
||||
UPDATE ${tableName} SET ${fieldName} = #{checkState},updateTime = NOW() WHERE ${keySet} = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 查询已整改的基本信息 -->
|
||||
<select id="queryOpinion" parameterType="map" resultType="map">
|
||||
SELECT
|
||||
|
|
|
|||
Loading…
Reference in New Issue