From 1511ea587018f6f97b7a044e066a6511bb663f2d Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 11 Apr 2024 19:23:44 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/call/HikvisionCall.java | 30 +-- .../controller/OrganizationJobController.java | 126 ++++++---- .../controller/SystemUserController.java | 22 ++ .../basicdata/entity/OperationLog.java | 3 +- .../basicdata/mapper/SystemUserMapper.java | 9 +- .../basicdata/mapper/xml/SystemUserMapper.xml | 8 +- .../basicdata/service/ISystemUserService.java | 5 + .../service/impl/SystemUserServiceImpl.java | 12 + .../impl/ProgressTaskAlarmServiceImpl.java | 1 + .../XzSupplierQualificationController.java | 227 ++++++++++-------- .../xz/entity/XzSupplierQualification.java | 15 ++ .../entity/XzSupplierQualificationRecord.java | 14 ++ .../modules/xz/entity/XzSupplierRecord.java | 49 ++++ .../modules/xz/mapper/XzProjectOrgMapper.java | 6 +- .../xz/mapper/xml/XzProjectOrgMapper.xml | 7 +- .../service/impl/XzProjectOrgServiceImpl.java | 47 ++-- 16 files changed, 384 insertions(+), 197 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 0356e2501..c2515752c 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -331,6 +331,13 @@ public class HikvisionCall { HashMap map = new HashMap<>(); String time = DateUtil.formatDateTime(DateUtil.parse(eventTime)); map.put("passTime", time); + Integer count = workerAttendanceMapper.selectCount(new LambdaQueryWrapper() + .eq(WorkerAttendance::getPersonSn, workerInfo.getPersonSn()) + .eq(WorkerAttendance::getCreateTime, time) + ); + if (count != 0) { + continue; + } map.put("idCard", workerInfo.getIdCard()); map.put("attendanceNumber", workerInfo.getAttendanceNumber()); int passType = workerAttendanceServiceImpl.getPassType(ufaceDev, time); @@ -347,13 +354,7 @@ public class HikvisionCall { } catch (Exception e) { e.printStackTrace(); } - Integer count = workerAttendanceMapper.selectCount(new LambdaQueryWrapper() - .eq(WorkerAttendance::getPersonSn, workerInfo.getPersonSn()) - .eq(WorkerAttendance::getCreateTime, time) - ); - if (count == 0) { - workerAttendanceService.saveExternalPassRecord(map); - } + workerAttendanceService.saveExternalPassRecord(map); } param.put("pageNo", param.getIntValue("pageNo") + 1); } @@ -431,6 +432,13 @@ public class HikvisionCall { log.info("海康车辆相机设备不存在：CameraId:{}", roadwaySyscode); continue; } + Integer count = carPassRecordMapper.selectCount(new LambdaQueryWrapper() + .eq(CarPassRecord::getCarNumber, plateNo) + .eq(CarPassRecord::getPassTime, time) + ); + if (count != 0) { + continue; + } CarPassRecord entity = new CarPassRecord(); entity.setCarNumber(plateNo); entity.setType(getPassType(carCamera.getPassType())); @@ -459,13 +467,7 @@ public class HikvisionCall { } else { entity.setIsOpen(0); } - Integer count = carPassRecordMapper.selectCount(new LambdaQueryWrapper() - .eq(CarPassRecord::getCarNumber, plateNo) - .eq(CarPassRecord::getPassTime, time) - ); - if (count == 0) { - carPassRecordMapper.insert(entity); - } + carPassRecordMapper.insert(entity); } param.put("pageNo", param.getIntValue("pageNo") + 1); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OrganizationJobController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OrganizationJobController.java index 515642ea4..5f9faa920 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OrganizationJobController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OrganizationJobController.java @@ -1,11 +1,13 @@ package com.zhgd.xmgl.modules.basicdata.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.OrganizationJob; import com.zhgd.xmgl.modules.basicdata.service.IOrganizationJobService; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -22,11 +24,11 @@ import java.util.List; import java.util.Map; - /** +/** * @Title: Controller * @Description: 组织岗位 * @author： pds - * @date： 2021-05-21 + * @date： 2021-05-21 * @version： V1.0 */ @RestController @@ -34,70 +36,90 @@ import java.util.Map; @Slf4j @Api(tags = "组织岗位") public class OrganizationJobController { - @Autowired - private IOrganizationJobService organizationJobService; + @Autowired + private IOrganizationJobService organizationJobService; - @ApiOperation(value = "列表查询组织岗位信息", notes = "列表查询组织岗位信息", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/selectList") - public Result> selectList(@RequestBody Map map) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(OrganizationJob::getSn, MapUtils.getString(map,"sn")); - List pageList = organizationJobService.list(queryWrapper); - return Result.success(pageList); - } - /** - * 添加 - * @param organizationJob - * @return - */ + @ApiOperation(value = "列表查询组织岗位信息", notes = "列表查询组织岗位信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/selectList") + public Result> selectList(@RequestBody Map map) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OrganizationJob::getSn, MapUtils.getString(map, "sn")); + List pageList = organizationJobService.list(queryWrapper); + return Result.success(pageList); + } + + @ApiOperation(value = "分页列表查询组织岗位信息", notes = "分页列表查询组织岗位信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/selectPage") + public Result> selectPage(@RequestBody Map map) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OrganizationJob::getSn, MapUtils.getString(map, "sn")); + Page page = PageUtil.getPage(map); + Page pageList = organizationJobService.page(page, queryWrapper); + return Result.success(pageList); + } + + + /** + * 添加 + * + * @param organizationJob + * @return + */ @OperLog(operModul = "组织岗位", operType = "添加组织岗位信息", operDesc = "添加组织岗位信息") @ApiOperation(value = "添加组织岗位信息", notes = "添加组织岗位信息", httpMethod = "POST") @PostMapping(value = "/add") - public Result add(@RequestBody OrganizationJob organizationJob) { + public Result add(@RequestBody OrganizationJob organizationJob) { organizationJobService.addOrganizationJob(organizationJob); return Result.ok(); - } + } - /** - * 编辑 - * @param organizationJob - * @return - */ - @OperLog(operModul = "组织岗位",operType = "编辑组织岗位信息",operDesc = "编辑组织岗位信息") - @ApiOperation(value = "编辑组织岗位信息", notes = "编辑组织岗位信息" , httpMethod="POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody OrganizationJob organizationJob) { + /** + * 编辑 + * + * @param organizationJob + * @return + */ + @OperLog(operModul = "组织岗位", operType = "编辑组织岗位信息", operDesc = "编辑组织岗位信息") + @ApiOperation(value = "编辑组织岗位信息", notes = "编辑组织岗位信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody OrganizationJob organizationJob) { organizationJobService.editOrganizationJob(organizationJob); return Result.ok(); - } + } - /** - * 通过id删除 - * @param - * @return - */ - @OperLog(operModul = "组织岗位",operType = "删除组织岗位信息",operDesc = "删除组织岗位信息") - @ApiOperation(value = "删除组织岗位信息", notes = "删除组织岗位信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "组织岗位ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - OrganizationJob organizationJob = organizationJobService.getById(MapUtils.getString(map,"id")); - if(organizationJob==null) { + /** + * 通过id删除 + * + * @param + * @return + */ + @OperLog(operModul = "组织岗位", operType = "删除组织岗位信息", operDesc = "删除组织岗位信息") + @ApiOperation(value = "删除组织岗位信息", notes = "删除组织岗位信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "组织岗位ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + Result result = new Result(); + OrganizationJob organizationJob = organizationJobService.getById(MapUtils.getString(map, "id")); + if (organizationJob == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = organizationJobService.removeById(MapUtils.getString(map,"id")); - if(ok) { + } else { + boolean ok = organizationJobService.removeById(MapUtils.getString(map, "id")); + if (ok) { result.successMsg(MessageUtil.get("deleteSucess")); - } - } + } + } return result; - } + } - } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 0323d615a..cc528a542 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; @@ -144,6 +145,17 @@ public class SystemUserController { return Result.success(systemUserService.getSystemUserBySn(map)); } + @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/getSystemUserBySnPage") + public Result> getSystemUserBySnPage(@RequestBody Map map) { + return Result.success(systemUserService.getSystemUserBySnPage(map)); + } + @ApiOperation(value = "查找项目子账号列表", notes = "查找项目子账号列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), @@ -230,6 +242,16 @@ public class SystemUserController { return Result.success(systemUserService.getTenantListBySn(map)); } + @ApiOperation(value = "根据项目SN查找新用户（租户）分页列表", notes = "根据项目SN查找新用户（租户）分页列表", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", required = true, value = "项目SN", paramType = "body"), + }) + @PostMapping(value = "/getTenantPageBySn") + public Result> getTenantPageBySn(@RequestBody Map map) { + return Result.success(systemUserService.getTenantPageBySn(map)); + } + + @ApiOperation(value = "星纵验证账号", notes = "星纵验证账号", httpMethod = "POST") @PostMapping(value = "/xz/checkAccount") public Result checkAccount(@RequestBody SystemUser systemUser) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/OperationLog.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/OperationLog.java index d43741785..75244e148 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/OperationLog.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/OperationLog.java @@ -81,7 +81,8 @@ public class OperationLog implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "操作时间") private java.util.Date operCreateTime; - + @TableField(exist = false) + private String projectSn; @TableField(exist = false) private String account; @TableField(exist = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java index 86c7c6e0c..daff7d8c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wflow.bean.do_.DeptDo; import com.wflow.bean.do_.UserDeptDo; @@ -28,7 +29,7 @@ import java.util.Set; @Mapper public interface SystemUserMapper extends BaseMapper { - List getSystemUserBySn(Map map); + List getSystemUserBySn(@Param("p") Map map); SystemUser findByUsername(@Param("account") String account); @@ -58,7 +59,7 @@ public interface SystemUserMapper extends BaseMapper { List getOrgSnListByUserId(HashMap paramMap); - List getTenantListBySn(Map map); + List getTenantListBySn(@Param("map") Map map); /** * 查询该部门下的所有用户 @@ -93,4 +94,8 @@ public interface SystemUserMapper extends BaseMapper { "#{item}", ""}) List getUserDepInfosBatch(@Param("list") Collection udIds); + + Page getSystemUserBySn(@Param("p") Map map, Page page); + + Page getTenantListBySn(@Param("map") Map map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index e677299fa..a75a868e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -4,9 +4,9 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java index 8b8d7838a..d6975029a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.entity.sj.JwtPayloadUserInfo; import com.zhgd.xmgl.modules.basicdata.entity.dto.LoginInfoByTokenDto; @@ -78,6 +79,8 @@ public interface ISystemUserService extends IService { List getTenantListBySn(Map map); + Page getTenantPageBySn(Map map); + void checkAccount(SystemUser systemUser); void getEmailCodeByAccount(HashMap hashMap); @@ -85,4 +88,6 @@ public interface ISystemUserService extends IService { HashMap resetPwValidCode(HashMap paramMap); void resetPwByEmail(HashMap paramMap); + + Page getSystemUserBySnPage(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index c41b5ce50..d108a6216 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -1182,6 +1182,12 @@ public class SystemUserServiceImpl extends ServiceImpl getTenantPageBySn(Map map) { + Page page = PageUtil.getPage(map); + return baseMapper.getTenantListBySn(map, page); + } + @Override public void checkAccount(SystemUser systemUser) { checkCode(systemUser); @@ -1252,6 +1258,12 @@ public class SystemUserServiceImpl extends ServiceImpl getSystemUserBySnPage(Map map) { + Page page = PageUtil.getPage(map); + return systemUserMapper.getSystemUserBySn(map, page); + } + public static void main(String[] args) { String timestamp = "1711613997695"; String pw = "123"; diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java index a5bf8cfa9..c5e9bf119 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskAlarmServiceImpl.java @@ -8,6 +8,7 @@ import com.zhgd.xmgl.modules.project.entity.qo.ProgressTaskAlarmQO; import com.zhgd.xmgl.modules.project.entity.vo.ProgressItemOverdueListVo; import com.zhgd.xmgl.modules.project.mapper.ProgressTaskAlarmMapper; import com.zhgd.xmgl.modules.project.service.ProgressTaskAlarmService; +import com.zhgd.xmgl.util.PageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java index 7ef2bb344..4919ae3a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzSupplierQualificationController.java @@ -1,13 +1,16 @@ package com.zhgd.xmgl.modules.xz.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.xz.entity.XzSupplierQualification; import com.zhgd.xmgl.modules.xz.service.IXzSupplierQualificationService; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; @@ -33,119 +36,139 @@ import java.util.Map; @Slf4j @Api(tags = "星纵-供应商-企业资质") public class XzSupplierQualificationController { - @Autowired - private IXzSupplierQualificationService xzSupplierQualificationService; + @Autowired + private IXzSupplierQualificationService xzSupplierQualificationService; - /** - * 分页列表查询 - * - * @return - */ - @ApiOperation(value = "列表查询星纵-供应商-企业资质信息", notes = "列表查询星纵-供应商-企业资质信息", httpMethod = "POST") + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询星纵-供应商-企业资质信息", notes = "列表查询星纵-供应商-企业资质信息", httpMethod = "POST") @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/list") - public Result> selectXzSupplierBadRecordList(@RequestBody Map map) { - Result> result = new Result>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); + public Result> selectXzSupplierBadRecordList(@RequestBody Map map) { + Result> result = new Result>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId")); - List pageList = xzSupplierQualificationService.list(queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime); + List pageList = xzSupplierQualificationService.list(queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 添加 - * - * @param xzSupplierQualification - * @return - */ - @OperLog(operModul = "供应商管理", operType = "添加星纵-供应商-企业资质", operDesc = "添加星纵-供应商-企业资质") - @ApiOperation(value = "添加星纵-供应商-企业资质信息", notes = "添加星纵-供应商-企业资质信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody XzSupplierQualification xzSupplierQualification) { - Result result = new Result(); - try { - xzSupplierQualificationService.save(xzSupplierQualification); - result.successMsg(MessageUtil.get("addSucess")); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500(MessageUtil.get("failErr")); - } - return result; - } + @ApiOperation(value = "分页列表查询星纵-供应商-企业资质信息", notes = "分页列表查询星纵-供应商-企业资质信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/page") + public Result> selectXzSupplierBadRecordPage(@RequestBody Map map) { + Result> result = new Result>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(XzSupplierQualification::getUserId, MapUtils.getString(map, "userId")); + queryWrapper.lambda().orderByDesc(XzSupplierQualification::getCreateTime); + Page page = PageUtil.getPage(map); + Page pageList = xzSupplierQualificationService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } - /** - * 编辑 - * - * @param xzSupplierQualification - * @return - */ - @OperLog(operModul = "供应商管理", operType = "编辑星纵-供应商-企业资质", operDesc = "编辑星纵-供应商-企业资质") - @ApiOperation(value = "编辑星纵-供应商-企业资质信息", notes = "编辑星纵-供应商-企业资质信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody XzSupplierQualification xzSupplierQualification) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualificationEntity = xzSupplierQualificationService.getById(xzSupplierQualification.getId()); - if (xzSupplierQualificationEntity == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = xzSupplierQualificationService.updateById(xzSupplierQualification); + /** + * 添加 + * + * @param xzSupplierQualification + * @return + */ + @OperLog(operModul = "供应商管理", operType = "添加星纵-供应商-企业资质", operDesc = "添加星纵-供应商-企业资质") + @ApiOperation(value = "添加星纵-供应商-企业资质信息", notes = "添加星纵-供应商-企业资质信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody XzSupplierQualification xzSupplierQualification) { + Result result = new Result(); + try { + xzSupplierQualificationService.save(xzSupplierQualification); + result.successMsg(MessageUtil.get("addSucess")); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500(MessageUtil.get("failErr")); + } + return result; + } - if (ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } + /** + * 编辑 + * + * @param xzSupplierQualification + * @return + */ + @OperLog(operModul = "供应商管理", operType = "编辑星纵-供应商-企业资质", operDesc = "编辑星纵-供应商-企业资质") + @ApiOperation(value = "编辑星纵-供应商-企业资质信息", notes = "编辑星纵-供应商-企业资质信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody XzSupplierQualification xzSupplierQualification) { + Result result = new Result(); + XzSupplierQualification xzSupplierQualificationEntity = xzSupplierQualificationService.getById(xzSupplierQualification.getId()); + if (xzSupplierQualificationEntity == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + boolean ok = xzSupplierQualificationService.updateById(xzSupplierQualification); - return result; - } + if (ok) { + result.successMsg(MessageUtil.get("editSucess")); + } + } - /** - * 通过id删除 - * - * @param - * @return - */ - @OperLog(operModul = "供应商管理", operType = "删除星纵-供应商-企业资质", operDesc = "删除星纵-供应商-企业资质") - @ApiOperation(value = "删除星纵-供应商-企业资质信息", notes = "删除星纵-供应商-企业资质信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); - if (xzSupplierQualification == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = xzSupplierQualificationService.removeById(MapUtils.getString(map, "id")); - if (ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } + return result; + } - return result; - } + /** + * 通过id删除 + * + * @param + * @return + */ + @OperLog(operModul = "供应商管理", operType = "删除星纵-供应商-企业资质", operDesc = "删除星纵-供应商-企业资质") + @ApiOperation(value = "删除星纵-供应商-企业资质信息", notes = "删除星纵-供应商-企业资质信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + Result result = new Result(); + XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); + if (xzSupplierQualification == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + boolean ok = xzSupplierQualificationService.removeById(MapUtils.getString(map, "id")); + if (ok) { + result.successMsg(MessageUtil.get("deleteSucess")); + } + } + + return result; + } - /** - * 通过id查询 - * - * @param - * @return - */ - @ApiOperation(value = "通过id查询星纵-供应商-企业资质信息", notes = "通过id查询星纵-供应商-企业资质信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/queryById") - public Result queryById(@RequestBody Map map) { - Result result = new Result(); - XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); - if (xzSupplierQualification == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - result.setResult(xzSupplierQualification); - result.setSuccess(true); - } - return result; - } + /** + * 通过id查询 + * + * @param + * @return + */ + @ApiOperation(value = "通过id查询星纵-供应商-企业资质信息", notes = "通过id查询星纵-供应商-企业资质信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "星纵-供应商-企业资质ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/queryById") + public Result queryById(@RequestBody Map map) { + Result result = new Result(); + XzSupplierQualification xzSupplierQualification = xzSupplierQualificationService.getById(MapUtils.getString(map, "id")); + if (xzSupplierQualification == null) { + result.error500(MessageUtil.get("notFindErr")); + } else { + result.setResult(xzSupplierQualification); + result.setSuccess(true); + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java index ef4c3c264..5c3bb7ca7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualification.java @@ -3,10 +3,12 @@ package com.zhgd.xmgl.modules.xz.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -60,5 +62,18 @@ public class XzSupplierQualification implements Serializable { private java.lang.String remarks; @ApiModelProperty(value = "源文件名称") private java.lang.String originFileName; + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java index 57ff6246c..d321cf7b9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java @@ -61,4 +61,18 @@ public class XzSupplierQualificationRecord implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remarks; + + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierRecord.java index 2d6b4ab4b..19a0d9865 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierRecord.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; 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; @@ -175,4 +176,52 @@ public class XzSupplierRecord implements Serializable { @Excel(name = "营业执照图片地址", width = 15) @ApiModelProperty(value = "营业执照图片地址") private java.lang.String businessLicenseUrl; + + /** + * xz_supplier_type表外键 + */ + @TableField(exist = false) + @ApiModelProperty(value = "企业类型Id") + private java.lang.Long xzSupplierTypeId; + + /** + * xz_supplier_type表外键 + */ + @TableField(exist = false) + @ApiModelProperty(value = "父级企业ID") + private java.lang.Long pid; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private java.lang.Integer sortNum; + + @TableField(exist = false) + @ApiModelProperty(value = "企业类型名称") + private java.lang.String xzSupplierTypeName; + + @TableField(exist = false) + @ApiModelProperty(value = "类型，1项目，2企业") + private java.lang.Integer type; + + @TableField(exist = false) + @ApiModelProperty(value = "项目负责人") + private java.lang.String projectDirectorName; + + @TableField(exist = false) + @ApiModelProperty(value = "项目负责人电话") + private java.lang.String projectDirectorPhone; + + @TableField(exist = false) + @ApiModelProperty(value = "是否是项目部公司，1否，2是") + private java.lang.Integer departmentType; + + @TableField(exist = false) + private String companyTypeName; + @TableField(exist = false) + private String xzUserToSupplierId; + + @TableField(exist = false) + @ApiModelProperty(value = "用户id") + private java.lang.Long userId; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java index 943764a6f..08420aefa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzProjectOrgMapper.java @@ -9,6 +9,8 @@ import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.List; + /** * @Description: 星纵-项目组织机构 * @author： pds @@ -20,7 +22,9 @@ public interface XzProjectOrgMapper extends BaseMapper { void deleteChildren(String id); - void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn); + void updateAncestors(@Param("oldAncestor") String oldAncestor, @Param("newAncestor") String newAncestor, @Param("projectSn") String projectSn, @Param("id") Long id); + + List getChildren(Long id); /** * 查询某部门下的子部门列表 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml index 8178a77da..903b20d63 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml @@ -10,6 +10,11 @@ UPDATE xz_project_org SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) - WHERE ancestors LIKE N'${oldAncestor}%' and project_sn = #{projectSn} + WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java index a804f82a7..d971ab532 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java @@ -88,40 +88,47 @@ public class XzProjectOrgServiceImpl extends ServiceImpl cOrgs = xzProjectOrgMapper.selectList(new LambdaQueryWrapper() - .eq(XzProjectOrg::getParentId, xzProjectOrg.getId()) - .eq(XzProjectOrg::getProjectSn, xzProjectOrg.getProjectSn()) - .eq(XzProjectOrg::getStatus, 0) - ); - if (CollUtil.isNotEmpty(cOrgs)) { - throw new OpenAlertException("该部门有下级部门未停用，不能停用"); + if (Objects.equals(xzProjectOrg.getStatus(), 1)) { + List cOrgs = xzProjectOrgMapper.selectList(new LambdaQueryWrapper() + .eq(XzProjectOrg::getParentId, xzProjectOrg.getId()) + .eq(XzProjectOrg::getProjectSn, xzProjectOrg.getProjectSn()) + .eq(XzProjectOrg::getStatus, 0) + ); + if (CollUtil.isNotEmpty(cOrgs)) { + throw new OpenAlertException("该部门有下级部门未停用，不能停用"); + } } if (!Objects.equals(oldPo.getParentId(), xzProjectOrg.getParentId())) { - XzProjectOrg pOrg = xzProjectOrgMapper.selectById(xzProjectOrg.getParentId()); - if (Objects.equals(xzProjectOrg.getStatus(), 0)) { - if (pOrg != null) { - if (Objects.equals(pOrg.getStatus(), 1)) { - throw new OpenAlertException("该上级部门状态为停用，无法修改"); - } + if (Objects.equals(xzProjectOrg.getId(), xzProjectOrg.getParentId())) { + throw new OpenAlertException("不能将部门移动到其自身"); + } + List children = baseMapper.getChildren(xzProjectOrg.getId()); + for (XzProjectOrg child : children) { + if (child.getId().equals(xzProjectOrg.getParentId())) { + throw new OpenAlertException("不能将部门移动到其自身下级"); } } - + XzProjectOrg pOrg = xzProjectOrgMapper.selectById(xzProjectOrg.getParentId()); // 修改子部门 boolean top = xzProjectOrg.getParentId() == null || xzProjectOrg.getParentId() == 0; if (top) { xzProjectOrg.setParentId(0L); xzProjectOrg.setAncestors("0"); } else { - if (pOrg != null) { - xzProjectOrg.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); - } else { - xzProjectOrg.setAncestors("0"); + if (pOrg == null) { + throw new OpenAlertException("上级部门不存在"); } + if (Objects.equals(xzProjectOrg.getStatus(), 0) && Objects.equals(pOrg.getStatus(), 1)) { + throw new OpenAlertException("该上级部门状态为停用，无法修改"); + } + xzProjectOrg.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); } + baseMapper.updateAncestors(oldPo.getAncestors(), xzProjectOrg.getAncestors(), xzProjectOrg.getProjectSn(), xzProjectOrg.getId()); + baseMapper.updateById(xzProjectOrg); + } else { + xzProjectOrg.setAncestors(null); baseMapper.updateById(xzProjectOrg); - baseMapper.updateAncestors(oldPo.getAncestors(), xzProjectOrg.getAncestors(), xzProjectOrg.getProjectSn()); } - } @Override