搬运工对账单及用户管理

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/CdEnterpriseEnnouncementController.java

@@ -138,6 +138,10 @@ public class CdEnterpriseEnnouncementController extends JeecgController<CdEnterp
 	@ApiOperation(value="企业公告-编辑", notes="企业公告-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody CdEnterpriseEnnouncement cdEnterpriseEnnouncement) {
+		if(StringUtils.isNotBlank(cdEnterpriseEnnouncement.getIsRelease()) &&
+				cdEnterpriseEnnouncement.getIsRelease().equals("1")){
+			cdEnterpriseEnnouncement.setReleaseTime(new Date());
+		}
 		cdEnterpriseEnnouncementService.updateById(cdEnterpriseEnnouncement);
 		return Result.ok("编辑成功!");
 	}
@@ -181,6 +185,12 @@ public class CdEnterpriseEnnouncementController extends JeecgController<CdEnterp
 	@GetMapping(value = "/queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		CdEnterpriseEnnouncement cdEnterpriseEnnouncement = cdEnterpriseEnnouncementService.getById(id);
+		if(StringUtils.isNotBlank(cdEnterpriseEnnouncement.getCreateBy())){
+			LoginUser login = sysBaseAPI.getUserByName(cdEnterpriseEnnouncement.getCreateBy());
+			if(login != null){
+				cdEnterpriseEnnouncement.setCreateBy(login.getRealname());
+			}
+		}
 		return Result.ok(cdEnterpriseEnnouncement);
 	}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/CdLinksController.java

@@ -9,14 +9,17 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.dataSource.OtherSource;
 import org.jeecg.modules.oa.entity.CdLinks;
+import org.jeecg.modules.oa.entity.SyCertificates;
 import org.jeecg.modules.oa.service.ICdLinksService;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -52,7 +55,8 @@ import io.swagger.annotations.ApiOperation;
 public class CdLinksController extends JeecgController<CdLinks, ICdLinksService> {
 	@Autowired
 	private ICdLinksService cdLinksService;
-	
+	 @Autowired
+	 private ISysBaseAPI sysBaseAPI;
 	/**
 	 * 分页列表查询
 	 *
@@ -72,7 +76,7 @@ public class CdLinksController extends JeecgController<CdLinks, ICdLinksService>
 		QueryWrapper<CdLinks> queryWrapper = QueryGenerator.initQueryWrapper(cdLinks, req.getParameterMap());
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String active = OtherSource.getProjectConfigActive("active");
-		if(!active.equals("senyu")){
+		if(active.equals("senyu")){
 			queryWrapper.lambda().eq(CdLinks::getCreateBy,sysUser.getUsername());
 		}
 		queryWrapper.lambda().eq(CdLinks::getPkOrg,sysUser.getOrgCode());
@@ -80,6 +84,17 @@ public class CdLinksController extends JeecgController<CdLinks, ICdLinksService>
 		queryWrapper.lambda().orderByDesc(CdLinks::getCreateTime);
 		Page<CdLinks> page = new Page<CdLinks>(pageNo, pageSize);
 		IPage<CdLinks> pageList = cdLinksService.page(page, queryWrapper);
+
+		for (CdLinks o:pageList.getRecords()) {
+
+			if(StringUtils.isNotBlank(o.getCreateBy())){
+				LoginUser login = sysBaseAPI.getUserByName(o.getCreateBy());
+				if(login != null){
+					o.setCreateBy(login.getRealname());
+				}
+			}
+		}
+
 		return Result.ok(pageList);
 	}
 	

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCarryController.java

@@ -228,9 +228,15 @@ public class SyCarryController {
 	 @GetMapping(value = "/commitBatch")
 	 public Result<?> commitBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="state",required=true) String state) {
 		 String res = this.syCarryService.commitBatch(Arrays.asList(ids.split(",")),state);
-		 return Result.ok(res);
+		 if(res.endsWith("成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
+
 	 }
 
+
 	 /**
 	  * 计划员签名
 	  *
@@ -240,7 +246,12 @@ public class SyCarryController {
 	 @GetMapping(value = "/signPlan")
 	 public Result<?> signPlan(@RequestParam(name="id",required=true) String id) {
 		 String res = syCarryService.signPlan(id);
-		 return Result.ok(res);
+		 if(res.equals("签字成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
+
 	 }
 
  }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCottonYarnController.java

@@ -228,7 +228,12 @@ public class SyCottonYarnController {
 	 @GetMapping(value = "/commitBatch")
 	 public Result<?> commitBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="state",required=true) String state) {
 		 String res = this.syCottonYarnService.commitBatch(Arrays.asList(ids.split(",")),state);
-		 return Result.ok(res);
+		 if(res.endsWith("成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
+
 	 }
 
 	 /**
@@ -240,6 +245,10 @@ public class SyCottonYarnController {
 	 @GetMapping(value = "/signPlan")
 	 public Result<?> signPlan(@RequestParam(name="id",required=true) String id) {
 		 String res = syCottonYarnService.signPlan(id);
-		 return Result.ok(res);
+		 if(res.equals("签字成功")){
+			 return Result.ok(res);
+		 }else{
+			 return Result.error(res);
+		 }
 	 }
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/SyCarryServiceImpl.java

@@ -51,10 +51,10 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 	@Transactional
 	public void updateMain(SyCarry syCarry,List<SyCarryB> syCarryBList) {
 		syCarryMapper.updateById(syCarry);
-		
+
 		//1.先删除子表数据
 		syCarryBMapper.deleteByMainId(syCarry.getId());
-		
+
 		//2.子表数据重新插入
 		for(SyCarryB entity:syCarryBList) {
 			//外键设置
@@ -186,10 +186,15 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String jhyByData = syCarryB.getJhyByData();
 		String jhyBy = syCarryB.getJhyBy();
+
+		if(StringUtils.isBlank(jhyByData)){
+			return "计划员为空，该数据不合法";
+		}
+
 		if(!jhyByData.contains(loginUser.getUsername())){
 			return "您无权操作此条数据";
 		}
-		if(jhyBy.contains(loginUser.getUsername())){
+		if(StringUtils.isNotBlank(jhyBy) && jhyBy.contains(loginUser.getUsername())){
 			return "此条数据以签字，请勿重新操作";
 		}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/SyCottonYarnServiceImpl.java

@@ -183,7 +183,7 @@ public class SyCottonYarnServiceImpl extends ServiceImpl<SyCottonYarnMapper, SyC
 
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		String jhyBy = syCottonYarnB.getJhyBy();
-		if(jhyBy.contains(loginUser.getUsername())){
+		if(StringUtils.isNotBlank(jhyBy) && jhyBy.contains(loginUser.getUsername())){
 			return "此条数据以签字，请勿重新操作";
 		}
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java

@@ -12,6 +12,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.oa.entity.CdLinks;
 import org.jeecg.modules.system.entity.SysPosition;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysPositionService;
@@ -76,7 +77,7 @@ public class SysPositionController {
         if(StringUtils.isNotBlank(name)){
             queryWrapper.lambda().like(SysPosition::getName,name);
         }
-
+        queryWrapper.lambda().orderByAsc(SysPosition::getCode);
         IPage<SysPosition> pageList = sysPositionService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -30,6 +30,7 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.dataSource.OtherSource;
 import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.*;
@@ -89,17 +90,38 @@ public class SysUserController {
 
 	@Autowired
 	private RedisUtil redisUtil;
-	
+
+	@Autowired
+	private SysUserMapper sysUserMapper;
+
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result<IPage<SysUser>> queryPageList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+		String deptName = user.getDeptName();
+        user.setDeptName(null);
 		QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
 		Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
 		//根据公司id过滤
         LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
         queryWrapper.lambda().like(SysUser::getPkOrg,sysUser.getOrgCode());
         queryWrapper.orderByAsc("create_time");
+
+        if(StringUtils.isNotBlank(deptName)){
+            SysUser user2 = new SysUser();
+            user2.setDeptName(deptName);
+            List<SysUser> aa = sysUserMapper.selectUserInfo("T",user2);
+            List<String> deptList = new ArrayList<>();
+
+            for(SysUser o:aa){
+                deptList.add(o.getId());
+            }
+            if(deptList.size() > 0){
+                queryWrapper.lambda().in(SysUser::getId,deptList);
+            }
+
+        }
+
 		IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
 
 		//批量查询用户的所属部门
@@ -515,29 +537,66 @@ public class SysUserController {
         for(SysPosition o:list2){
             map.put(o.getCode(),o.getName());
         }
-       for(SysUser o:pageList){
-
-           SysUserAddress add = new SysUserAddress();
-
-
-           if(StringUtils.isNotBlank(o.getIfOa()) && o.getIfOa().equals("1")){
-               o.setIfOa("是");
-           }else{
-               o.setIfOa("否");
-           }
-           if(StringUtils.isNotBlank(o.getNMarriage()) && o.getNMarriage().equals("1")){
-               o.setNMarriage("是");
-           }
-           if(StringUtils.isNotBlank(o.getNMarriage()) && o.getNMarriage().equals("0")){
-               o.setNMarriage("否");
-           }
-           if(StringUtils.isNotBlank(o.getPost()) && map.containsKey(o.getPost())){
-               o.setPost(map.get(o.getPost()));
-           }
-
-           BeanUtils.copyProperties(add,o);
-           pageList2.add(add);
-       }
+
+        List<String> userIds = pageList.stream().map(SysUser::getId).collect(Collectors.toList());
+        if(userIds!=null && userIds.size()>0){
+            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+            pageList.forEach(item->{
+                //TODO 临时借用这个字段用于页面展示
+//                item.setOrgCode(useDepNames.get(item.getId()));
+
+                SysUserAddress add = new SysUserAddress();
+
+                if(StringUtils.isNotBlank(item.getIfOa()) && item.getIfOa().equals("1")){
+                    item.setIfOa("是");
+                }else{
+                    item.setIfOa("否");
+                }
+                if(StringUtils.isNotBlank(item.getNMarriage()) && item.getNMarriage().equals("1")){
+                    item.setNMarriage("是");
+                }
+                if(StringUtils.isNotBlank(item.getNMarriage()) && item.getNMarriage().equals("0")){
+                    item.setNMarriage("否");
+                }
+                if(StringUtils.isNotBlank(item.getPost()) && map.containsKey(item.getPost())){
+                    item.setPost(map.get(item.getPost()));
+                }
+
+                try {
+                    BeanUtils.copyProperties(add,item);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                } catch (InvocationTargetException e) {
+                    e.printStackTrace();
+                }
+                add.setDept(useDepNames.get(item.getId()));
+                pageList2.add(add);
+
+            });
+        }
+//       for(SysUser o:pageList){
+//
+//           SysUserAddress add = new SysUserAddress();
+//
+//
+//           if(StringUtils.isNotBlank(o.getIfOa()) && o.getIfOa().equals("1")){
+//               o.setIfOa("是");
+//           }else{
+//               o.setIfOa("否");
+//           }
+//           if(StringUtils.isNotBlank(o.getNMarriage()) && o.getNMarriage().equals("1")){
+//               o.setNMarriage("是");
+//           }
+//           if(StringUtils.isNotBlank(o.getNMarriage()) && o.getNMarriage().equals("0")){
+//               o.setNMarriage("否");
+//           }
+//           if(StringUtils.isNotBlank(o.getPost()) && map.containsKey(o.getPost())){
+//               o.setPost(map.get(o.getPost()));
+//           }
+//
+//           BeanUtils.copyProperties(add,o);
+//           pageList2.add(add);
+//       }
 
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserAddress.java

@@ -46,6 +46,12 @@ public class SysUserAddress{
     @Excel(name = "职务", width = 15)
     private String post;
 
+    /**
+     * 部门
+     */
+    @Excel(name = "部门", width = 15)
+    private String dept;
+
     /**
      * 电话
      */

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -112,6 +112,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUserSysDepartModel> getUserByOrgCode(IPage page, @Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
 
 	List<SysUserSysDepartModel> selectUserInfo(IPage page, @Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
+	List<SysUser> selectUserInfo(@Param("orgCode") String orgCode, @Param("userParams") SysUser userParams);
 
 
     /**

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -138,7 +138,10 @@
 			   a.id AS "id",
 			   a.realname AS "realname",
 			   a.work_no AS "work_no",
-			   a.post AS "post",
+				CASE when d.name = null or d.name = '' or d.name is null
+				THEN a.post
+				ELSE d.name
+				END AS "post",
 			   a.telephone AS "telephone",
 			   a.email AS "email",
 			   a.phone AS "phone" ,
@@ -148,6 +151,7 @@
 		from sys_user a
 				 left join sys_user_depart b on a.id = b.user_id
 				 left join sys_depart c on c.id = b.dep_id
+		left join sys_position d on d.code = a.post
 
 		WHERE
 		a.del_flag='0' and a.communication !=1 AND c.org_code LIKE '${orgCode}%'