ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

履职清单导入&企业详情bug修改

Browse Source
This commit is contained in:
韩国东 2022-12-19 14:03:14 +08:00
parent 543e337533
commit f4a838440b
6 changed files with 231 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java
View File

@ -97,6 +97,11 @@ public interface ListPerformMapper {
ListPerform findByName(@Param("performClassName") String performClassName,
@Param("supClassId") String supClassId);
/*查询岗位*/
ListPerform findBySortId(@Param("performClassName") String performClassName,
@Param("supClassId") String supClassId,
@Param("sortId") Integer sortId);
//部门列表
List<ListPerform> findUnit(@Param("superPerformId") String superPerformId);

12
inventory-dao/src/main/resources/mapper/user/ListPerformMapper.xml
View File

@ -629,9 +629,9 @@
<if test="null != supClassId and '' != supClassId">
AND lp.`SupClassId` = #{supClassId}
</if>
<!-- <if test="null != performId and '' != performId">
<if test="null != performId and '' != performId">
and lp.ListPerformId = #{performId}
</if>-->
</if>
<if test="null != superPerformId and '' != superPerformId">
and FIND_IN_SET(#{superPerformId},lp.parent_path)
</if>
@ -734,6 +734,14 @@
AND lf.`SupClassId` = #{supClassId}
</select>
<!--查询岗位-->
<select id="findBySortId" resultMap="BaseResultMap">
SELECT * FROM ListPerform lf
WHERE lf.`PerformClassName` = #{performClassName}
AND lf.`SupClassId` = #{supClassId}
AND lf.SortId = #{sortId}
</select>
<!--岗位列表-->
<select id="findUnit" resultMap="BaseResultMap">

20
inventory-gov/src/main/java/com/rzyc/controller/BaseController.java
View File

@ -2295,7 +2295,6 @@ public class BaseController {
Integer index = 1;
for (OaTaskTime taskTime : taskTimes){
OATask oaTask = new OATask();
SysUser sysUser = getUser(sysUserId);
String subject = year+"年第"+index+"月工作任务:"+listFactor.getFactorcnt();
oaTask.setSubject(subject);
oaTask.setFrequency(0l);
@ -2308,9 +2307,9 @@ public class BaseController {
oaTask.setStartdate(start);
oaTask.setPlanenddate(end);
oaTask.setDelState(DelState.NOT_DEL.getState());
oaTask.setCreatedby(sysUser.getChinaname());
oaTask.setCreatedby(sysUserId);
oaTask.setCreatedon(new Date());
oaTask.setModifiedby(sysUser.getChinaname());
oaTask.setModifiedby(sysUserId);
oaTask.setModifiedon(new Date());
oaTasks.add(oaTask);
index++;
@ -2330,7 +2329,6 @@ public class BaseController {
Integer index = 1;
for (OaTaskTime taskTime : taskTimes){
OATask oaTask = new OATask();
SysUser sysUser = getUser(sysUserId);
String subject = year+"年第"+index+"季度工作任务:："+listFactor.getFactorcnt();
oaTask.setSubject(subject);
oaTask.setFrequency(0l);
@ -2343,9 +2341,9 @@ public class BaseController {
oaTask.setStartdate(start);
oaTask.setPlanenddate(end);
oaTask.setDelState(DelState.NOT_DEL.getState());
oaTask.setCreatedby(sysUser.getChinaname());
oaTask.setCreatedby(sysUserId);
oaTask.setCreatedon(new Date());
oaTask.setModifiedby(sysUser.getChinaname());
oaTask.setModifiedby(sysUserId);
oaTask.setModifiedon(new Date());
oaTasks.add(oaTask);
index++;
@ -2361,7 +2359,6 @@ public class BaseController {
private List<OATask> getYearTask(ListFactor listFactor,String sysUserId)throws Exception{
List<OATask> oaTasks = new ArrayList<>();
OATask oaTask = new OATask();
SysUser sysUser = getUser(sysUserId);
Integer year = Calendar.getInstance().get(Calendar.YEAR);
String startTime = year + "-01-01 00:00:01";
String endTime = year + "-12-31 23:59:59";
@ -2377,9 +2374,9 @@ public class BaseController {
oaTask.setStartdate(start);
oaTask.setPlanenddate(end);
oaTask.setDelState(DelState.NOT_DEL.getState());
oaTask.setCreatedby(sysUser.getChinaname());
oaTask.setCreatedby(sysUserId);
oaTask.setCreatedon(new Date());
oaTask.setModifiedby(sysUser.getChinaname());
oaTask.setModifiedby(sysUserId);
oaTask.setModifiedon(new Date());
oaTasks.add(oaTask);
return oaTasks;
@ -2396,7 +2393,6 @@ public class BaseController {
Integer year = Calendar.getInstance().get(Calendar.YEAR);
for (OaTaskTime taskTime : taskTimes){
OATask oaTask = new OATask();
SysUser sysUser = getUser(sysUserId);
String subject = year+"年工作任务："+listFactor.getFactorcnt();
oaTask.setSubject(subject);
oaTask.setFrequency(0l);
@ -2409,9 +2405,9 @@ public class BaseController {
oaTask.setStartdate(start);
oaTask.setPlanenddate(end);
oaTask.setDelState(DelState.NOT_DEL.getState());
oaTask.setCreatedby(sysUser.getChinaname());
oaTask.setCreatedby(sysUserId);
oaTask.setCreatedon(new Date());
oaTask.setModifiedby(sysUser.getChinaname());
oaTask.setModifiedby(sysUserId);
oaTask.setModifiedon(new Date());
oaTasks.add(oaTask);
}

179
inventory-gov/src/main/java/com/rzyc/controller/DataController.java
View File

@ -800,6 +800,185 @@ public class DataController extends com.rzyc.controller.BaseController {
System.out.println();
}
}
}
return result;
}
@ApiOperation(value = "导入岗位履职清单", notes = "导入岗位履职清单")
@RequestMapping(value = "/importFactor", method = RequestMethod.POST)
@ResponseBody
public SingleResult<String> importFactor(@RequestBody MultipartFile multipartFile)throws Exception{
SingleResult<String> result = new SingleResult<>();
Workbook wookbook = WorkbookFactory.create(multipartFile.getInputStream());
Sheet sheet = wookbook.getSheetAt(0);
//获得表头
Row rowHead = sheet.getRow(0);
System.out.println("getPhysicalNumberOfCells -> "+rowHead.getPhysicalNumberOfCells());
//判断表头是否正确
if(true){
//获得数据的总行数
int totalRowNum = sheet.getLastRowNum();
if(totalRowNum > 0){
Boolean isSubject = true;
DataFormatter dataFormatter = new DataFormatter();
Map<String,String> sortMap = new LinkedHashMap<>();
Map<String,String> workDivisionMap = new HashMap<>();
Map<String,String> performNameMap = new HashMap<>();
Map<String,List<String>> dutyMap = new HashMap<>();
Integer index = 1;
String unitNameStr = "";
String postNameStr = "";
String sortStrStr = "";
//获得所有数据
for(int i = 1 ; i <= totalRowNum ; i++){
//获得第i行对象
Row row = sheet.getRow(i);
if(null == row){
break;
}
String unitName = "";
String postName = "";
String sortStr = "";
String workDivision = "";
String dutyList = "";
String performList = "";
String performName = "";
String checkstandardStr = "";
String frequency = "";
String mapKey = "";
Cell cell = row.getCell((short)0);
unitName = dataFormatter.formatCellValue(cell);
if(StringUtils.isBlank(unitName)){
unitName = unitNameStr;
}else{
unitNameStr = unitName;
}
cell = row.getCell((short)1);
postName = dataFormatter.formatCellValue(cell);
if(StringUtils.isBlank(postName)){
postName = postNameStr;
}else{
postNameStr = postName;
}
mapKey = unitName + "---"+postName;
cell = row.getCell((short)2);
sortStr = dataFormatter.formatCellValue(cell);
if(StringUtils.isBlank(sortStr)){
sortStr = sortStrStr;
}else{
sortStrStr = sortStr;
}
cell = row.getCell((short)3);
workDivision = dataFormatter.formatCellValue(cell);
if(StringUtils.isNotBlank(workDivision)){
workDivisionMap.put(mapKey,workDivision);
}
cell = row.getCell((short)4);
dutyList = dataFormatter.formatCellValue(cell);
cell = row.getCell((short)5);
performList = dataFormatter.formatCellValue(cell);
cell = row.getCell((short)6);
checkstandardStr = dataFormatter.formatCellValue(cell);
if(StringUtils.isBlank(checkstandardStr)){
checkstandardStr = "每年";
}
cell = row.getCell((short)7);
frequency = dataFormatter.formatCellValue(cell);
if(null != frequency){
frequency = 1+"";
}
if(StringUtils.isBlank(performList)){
performList = dutyList;
}
System.out.println("-----------------"+index);
System.out.println(unitName);
System.out.println(postName);
System.out.println(sortStr);
System.out.println(performList);
System.out.println(checkstandardStr);
System.out.println(frequency);
Integer checkstandard = 1;
if("每年".equals(checkstandardStr)){
checkstandard = 1;
}else if("每半年".equals(checkstandardStr)){
checkstandard = 2;
}else if("每季度".equals(checkstandardStr)){
checkstandard = 4;
}else if("每月".equals(checkstandardStr)){
checkstandard = 12;
}
System.out.println("checkstandard -------> "+checkstandard);
System.out.println("frequency -------> "+TypeConversion.StringToInteger(frequency));
ListPerform superPerform = listPerformMapper.findByName(unitName,"5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9");
if(null != superPerform){
ListPerform listPerform = listPerformMapper.findBySortId(postName,superPerform.getListperformid(),TypeConversion.StringToInteger(sortStr));
if(null != listPerform){
ListFactor listFactor = new ListFactor();
listFactor.setListfactorid(RandomNumber.getUUid());
listFactor.setListperformid(listPerform.getListperformid());
listFactor.setListnum(1+"");
listFactor.setSortid(i);
listFactor.setSysyear("2022");
listFactor.setType(4);
listFactor.setFactorcnt(performList);
listFactor.setCheckstandard(checkstandard);
listFactor.setFrequency(TypeConversion.StringToInteger(frequency));
listFactor.setIsfinish("否");
listFactor.setFinishProgres("0");
listFactor.setFactorIsFinish("否");
listFactor.setRedAlert(2+"");
listFactor.setYellowAlert(5+"");
listFactor.setDelState(1);
listFactor.setCreatedon(new Date());
listFactor.setModifiedon(new Date());
listFactor.setCreatedby("excel");
listFactor.setModifiedby("excel");
listFactorMapper.insert(listFactor);
addFactorTask(listFactor,"excel");
}
}
index++;
}
}
}
return result;

15
inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
View File

@ -1545,14 +1545,23 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
String userId = performPageDto.getUserId();
String performId = "";
if(StringUtils.isBlank(userId)){
userId = getUserId();
Pager<ListPerform> pager = new Pager<>();
if(StringUtils.isNotBlank(userId)){
SysUser sysUser = sysUserMapper.selectByPrimaryKey(userId);
if(null != sysUser){
performId = sysUser.getSystitle();
}
PageHelper.startPage(performPageDto.getPage(), performPageDto.getPageSize());
Page<ListPerform> page = (Page<ListPerform>)listPerformMapper.performPage(performPageDto.getListperformid(),performId,condition,"");
getDatePage(pager,page);
}else{
userId = getUserId();
String superPerformId = getSuperPerformId(userId);
PageHelper.startPage(performPageDto.getPage(), performPageDto.getPageSize());
Page<ListPerform> page = (Page<ListPerform>)listPerformMapper.performPage(performPageDto.getListperformid(),performId,condition,superPerformId);
Pager<ListPerform> pager = new Pager<>();
getDatePage(pager,page);
}
result.setData(pager);
return result;
}

7
inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
View File

@ -176,8 +176,11 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
List<SysUnit> units = sysUnitMapper.findUnit("");
String sysUnitId = sysEnterprises.get(0).getSysUnitId();
String managerDept = sysEnterprises.get(0).getManagerDept();
String [] arr=sysUnitId.split(",");
StringBuilder stringBuilder = new StringBuilder();
String [] arr = null;
if(StringUtils.isNotBlank(sysUnitId)){
arr=sysUnitId.split(",");
for (String i:arr) {
for (SysUnit un:units) {
if (un.getSysunitid().equals(managerDept)){
@ -188,6 +191,8 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
}
}
}
}
if (StringUtils.isNotBlank(stringBuilder.toString())){
sysEnterprises.get(0).setSysUnitName(stringBuilder.toString().substring(0,stringBuilder.toString().length()-1));
}