Skip to content

A
amos-boot-biz
Commit ccbf779a authored by limei's avatar limei
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

# Conflicts: # amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
parents 766517d0 aabf4cb5
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 144 deletions
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java
View file @ ccbf779a
...@@ -18,7 +18,7 @@ public enum OrgEnum { ...@@ -18,7 +18,7 @@ public enum OrgEnum {
建设单位("CONSTRUCTION","249","建设单位",1), 建设单位("CONSTRUCTION","249","建设单位",1),
安装单位("INSTALL","250","安装单位",1), 安装单位("INSTALL","250","安装单位",1),
设计单位("DESIGN","251","设计单位",1), 设计单位("DESIGN","251","设计单位",1),
监察单位("SUPERVISION","252","监察单位",1), 监察部门("SUPERVISION","252","监察部门",1),
监检机构("MONITORING","253","监检机构",1); 监检机构("MONITORING","253","监检机构",1);
private String key; private String key;
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/DepartmentDto.java deleted 100644 → 0
View file @ 766517d0
package com.yeejoin.amos.boot.module.ugp.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @Author cpp
* @Description 部门负责人 部门名称
* @Date 2022/10/25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="DepartmentDto", description="接收参数")
public class DepartmentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "部门名称")
private String departmentName;
@ApiModelProperty(value = "部门负责人")
private String departmentHead;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeDto.java
View file @ ccbf779a
...@@ -54,4 +54,7 @@ public class InstallNoticeDto extends BaseDto { ...@@ -54,4 +54,7 @@ public class InstallNoticeDto extends BaseDto {
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "安装负责人")
private String installPri;
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Company.java
View file @ ccbf779a
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
...@@ -24,68 +25,68 @@ public class Company extends BaseEntity { ...@@ -24,68 +25,68 @@ public class Company extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "企业名称") @TableField("name")
private String name; private String name;
@ApiModelProperty(value = "企业类型") @TableField("type")
private String type; private String type;
@ApiModelProperty(value = "统一信用代码") @TableField("credit_code")
private String creditCode; private String creditCode;
@ApiModelProperty(value = "许可证号") @TableField("license_number")
private String licenseNumber; private String licenseNumber;
@ApiModelProperty(value = "有效期至") @TableField("expiration_date")
private Date expirationDate; private Date expirationDate;
@ApiModelProperty(value = "企业地址") @TableField("address")
private String address; private String address;
@ApiModelProperty(value = "联系方式") @TableField("contact_phone")
private String contactPhone; private String contactPhone;
@ApiModelProperty(value = "联系人") @TableField("contact")
private String contact; private String contact;
@TableField("remark")
private String remark; private String remark;
@ApiModelProperty(value = "统一信用代码证书附件") @TableField("credit_attch")
private String creditAttch; private String creditAttch;
@ApiModelProperty(value = "许可证附件") @TableField("license_attch")
private String licenseAttch; private String licenseAttch;
@ApiModelProperty(value = "是否已审核（1已审核，0未审核）") @TableField("approved")
private String approved; private String approved;
@ApiModelProperty(value = "单位机构代码") @TableField("org_code")
private String orgCode; private String orgCode;
@ApiModelProperty(value = "企业管理员") @TableField("admin_name")
private String adminName; private String adminName;
@ApiModelProperty(value = "企业管理员电话") @TableField("admin_tel")
private String adminTel; private String adminTel;
@ApiModelProperty(value = "法人") @TableField("legal_person")
private String legalPerson; private String legalPerson;
@ApiModelProperty(value = "法人电话") @TableField("legal_person_tel")
private String legalPersonTel; private String legalPersonTel;
@ApiModelProperty(value = "单位电话") @TableField("unit_tel")
private String unitTel; private String unitTel;
@ApiModelProperty(value = "成立日期") @TableField("create_time")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "管理员身份证附件") @TableField("admin_lincense_pic")
private String adminLincensePic; private String adminLincensePic;
@ApiModelProperty(value = "用户名") @TableField("admin_login_name")
private String adminLoginName; private String adminLoginName;
@ApiModelProperty(value = "用户密码") @TableField("admin_login_pwd")
private String adminLoginPwd; private String adminLoginPwd;
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/CompanyMapper.java
View file @ ccbf779a
package com.yeejoin.amos.boot.module.ugp.api.mapper; package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 企业信息表 Mapper 接口 * 企业信息表 Mapper 接口
...@@ -9,5 +15,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company; ...@@ -9,5 +15,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
* @author system_generator * @author system_generator
* @date 2022-09-22 * @date 2022-09-22
*/ */
@Mapper
public interface CompanyMapper extends BaseMapper<Company> { public interface CompanyMapper extends BaseMapper<Company> {
List<CompanyDto> queryCompanyPage(Company companyParam);
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/VerifyMapper.java
View file @ ccbf779a
package com.yeejoin.amos.boot.module.ugp.api.mapper; package com.yeejoin.amos.boot.module.ugp.api.mapper;
import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Verify; import com.yeejoin.amos.boot.module.ugp.api.entity.Verify;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -21,6 +22,6 @@ public interface VerifyMapper extends BaseMapper<Verify> { ...@@ -21,6 +22,6 @@ public interface VerifyMapper extends BaseMapper<Verify> {
* @return * @return
*/ */
List<Verify> commonality(String stage); List<Verify> commonality(String stage,SmartListDto smartListDto);
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/ICompanyService.java
View file @ ccbf779a
...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ugp.api.service; ...@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
/** /**
...@@ -12,6 +14,8 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company; ...@@ -12,6 +14,8 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
*/ */
public interface ICompanyService { public interface ICompanyService {
Page<CompanyDto> queryCompanyPage(int current, int size,Company company);
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IVerifyService.java
View file @ ccbf779a
...@@ -10,6 +10,6 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto; ...@@ -10,6 +10,6 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.SmartListDto;
* @date 2022-09-22 * @date 2022-09-22
*/ */
public interface IVerifyService { public interface IVerifyService {
Page<SmartListDto> commonality(String stage, Page<SmartListDto> page); Page<SmartListDto> commonality(String stage, Page<SmartListDto> page,SmartListDto smartListDto);
} }
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/CompanyMapper.xml
View file @ ccbf779a
...@@ -2,4 +2,17 @@ ...@@ -2,4 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper"> <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper">
<select id="queryCompanyPage" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Company">
select * from tz_ugp_company
<where>
<if test="name != '' and name != null">
and `name` like concat('%',#{name},'%')
</if>
<if test="type != '' and type != null">
and `type` like concat('%',#{type},'%')
</if>
</where>
</select>
</mapper> </mapper>
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallNoticeMsgMapper.xml
View file @ ccbf779a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
and tz_ugp_project.name like '%${name}%' and tz_ugp_project.name like '%${name}%'
</if> </if>
<if test="installationUnit != null and installationUnit != ''"> <if test="installationUnit != null and installationUnit != ''">
and tz_ugp_project.installationUnit like '%${installationUnit}%' and tz_ugp_project.installation_unit like concat("%",#{installationUnit},"%")
</if> </if>
</select> </select>
<select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto"> <select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto">
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml
View file @ ccbf779a
...@@ -52,6 +52,16 @@ ...@@ -52,6 +52,16 @@
and and
vf.stage =#{stage} vf.stage =#{stage}
</if> </if>
<if test="smartListDto.name !='' and smartListDto.name != null">
and
pt.name like '%${smartListDto.name}%'
</if>
<if test="smartListDto.projectCode !='' and smartListDto.projectCode != null">
and
pt.code like '%${smartListDto.projectCode}%'
</if>
</select> </select>
</mapper> </mapper>
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WorkHistoryMapper.xml
View file @ ccbf779a
...@@ -23,6 +23,9 @@ ...@@ -23,6 +23,9 @@
<if test="tzUgpWorkHistory.endDate!='' and tzUgpWorkHistory.endDate!=null"> <if test="tzUgpWorkHistory.endDate!='' and tzUgpWorkHistory.endDate!=null">
and wh.end_date like concat("%",#{tzUgpWorkHistory.endDate},"%") and wh.end_date like concat("%",#{tzUgpWorkHistory.endDate},"%")
</if> </if>
<if test="tzUgpWorkHistory.sequenceNbr!='' and tzUgpWorkHistory.sequenceNbr!=null">
and wh.sequence_nbr = #{tzUgpWorkHistory.sequenceNbr}
</if>
</where> </where>
</select> </select>
</mapper> </mapper>
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
View file @ ccbf779a
package com.yeejoin.amos.boot.module.ugp.biz.controller; package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sun.org.apache.xpath.internal.objects.XObject; import com.sun.org.apache.xpath.internal.objects.XObject;
...@@ -13,24 +13,27 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams; ...@@ -13,24 +13,27 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.bo.RoleBo; import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant; import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto; import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant; import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper; import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl; import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
import com.yeejoin.amos.component.feign.config.TokenOperation; import com.yeejoin.amos.component.feign.config.TokenOperation;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.robot.AmosRequestContext; import com.yeejoin.amos.component.robot.AmosRequestContext;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.*; import com.yeejoin.amos.feign.privilege.model.*;
import com.yeejoin.amos.feign.privilege.util.DesUtil; import com.yeejoin.amos.feign.privilege.util.DesUtil;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
...@@ -164,9 +167,9 @@ public class CompanyController extends BaseController { ...@@ -164,9 +167,9 @@ public class CompanyController extends BaseController {
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询", notes = "企业信息表分页查询") @ApiOperation(httpMethod = "GET",value = "企业信息表分页查询", notes = "企业信息表分页查询")
public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size,CompanyDto companyDto) { (value = "size") int size,Company company) {
return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,companyDto)); return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,company));
} }
/** /**
...@@ -227,16 +230,33 @@ public class CompanyController extends BaseController { ...@@ -227,16 +230,33 @@ public class CompanyController extends BaseController {
} }
/*** /***
* 部門新增 * 部門新增或更新
* @param dto * @param jsonObject 表单数据
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping(value = "department") @PostMapping(value = "department")
@ApiOperation(httpMethod = "POST", value = "部門新增", notes = "部門新增") @ApiOperation(httpMethod = "POST", value = "部門新增或更新", notes = "部門新增或更新")
public ResponseModel<Boolean> getInfo(@RequestBody DepartmentDto dto) { public ResponseModel<Boolean> getInfo(@RequestBody JSONObject jsonObject, @RequestParam(required = false) String sequenceNbr) {
return ResponseHelper.buildResponse(companyServiceImpl.saveDepartment(dto)); return ResponseHelper.buildResponse(companyServiceImpl.saveDepartment(jsonObject,sequenceNbr));
}
/***
* 获取当前登录人所在单位下的所有部门
* @param
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/deptList")
@ApiOperation(httpMethod = "GET", value = "部門新增", notes = "部門新增")
public ResponseModel<IPage> getDept(String size, String current) {
Page<OrgUsr> page = new Page<>();
page.setSize(Long.parseLong(size));
page.setCurrent(Long.parseLong(current));
return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDept(page));
} }
/** /**
* 企业注册：获取单位类型 * 企业注册：获取单位类型
*/ */
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java
View file @ ccbf779a
...@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller; ...@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.*; import com.yeejoin.amos.boot.module.ugp.api.dto.*;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice; import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
...@@ -20,12 +22,10 @@ import io.swagger.annotations.Api; ...@@ -20,12 +22,10 @@ import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.InstallNoticeServiceImpl; import com.yeejoin.amos.boot.module.ugp.biz.service.impl.InstallNoticeServiceImpl;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -195,23 +195,7 @@ public class InstallNoticeController extends BaseController { ...@@ -195,23 +195,7 @@ public class InstallNoticeController extends BaseController {
@PostMapping (value = "/saveInstallNotice") @PostMapping (value = "/saveInstallNotice")
@ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请") @ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请")
public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus ) { public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus ) {
InstallNoticeDto installNoticeDto = new InstallNoticeDto(); InstallNoticeDto installNoticeDto = installNoticeServiceImpl.saveInstallNotice(object, noticeStatus);
final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name"));
installNoticeDto.setProjectId(object.getLong("name"));
installNoticeDto.setNoticeStatus(noticeStatus);
installNoticeDto.setNoticeDate(new Date());
installNoticeDto.setApproved(false);
installNoticeDto.setOrganizationCode(orgServiceImpl.getOrgUsr().getBizOrgCode());
installNoticeDto.setLicenseNum(object.getString("licenseNum"));
installNoticeDto.setLicenseCompany(object.getString("licenseCompany"));
final JSONArray licenseAttch = object.getJSONArray("licenseAttch");
final JSONArray contractAttch = object.getJSONArray("contractAttch");
installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch));
installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch));
projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1");
return ResponseHelper.buildResponse(installNoticeServiceImpl.createWithModel(installNoticeDto)); return ResponseHelper.buildResponse(installNoticeServiceImpl.createWithModel(installNoticeDto));
} }
...@@ -226,15 +210,7 @@ public class InstallNoticeController extends BaseController { ...@@ -226,15 +210,7 @@ public class InstallNoticeController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr安装告知信息", notes = "根据sequenceNbr安装告知信息") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr安装告知信息", notes = "根据sequenceNbr安装告知信息")
public ResponseModel<JSONObject> selectOneBySeq(@PathVariable Long sequenceNbr) { public ResponseModel<JSONObject> selectOneBySeq(@PathVariable Long sequenceNbr) {
final InstallNoticeDto installNoticeDto = installNoticeServiceImpl.selectOneById(sequenceNbr); JSONObject jsonObject = installNoticeServiceImpl.selectOneBySeq(sequenceNbr);
final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId());
JSONObject jsonObject = new JSONObject();
jsonObject.put("name",projectDto.getSequenceNbr());
jsonObject.put("installRegion",projectDto.getInstallRegion());
jsonObject.put("licenseNum",installNoticeDto.getLicenseNum());
jsonObject.put("licenseCompany",installNoticeDto.getLicenseCompany());
jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch()));
jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch()));
return ResponseHelper.buildResponse(jsonObject); return ResponseHelper.buildResponse(jsonObject);
} }
...@@ -259,6 +235,7 @@ public class InstallNoticeController extends BaseController { ...@@ -259,6 +235,7 @@ public class InstallNoticeController extends BaseController {
installNoticeDto.setLicenseCompany(object.getString("licenseCompany")); installNoticeDto.setLicenseCompany(object.getString("licenseCompany"));
final JSONArray licenseAttch = object.getJSONArray("licenseAttch"); final JSONArray licenseAttch = object.getJSONArray("licenseAttch");
final JSONArray contractAttch = object.getJSONArray("contractAttch"); final JSONArray contractAttch = object.getJSONArray("contractAttch");
installNoticeDto.setInstallPri(object.getString("installPri"));
installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch)); installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch));
installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch)); installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch));
...@@ -278,14 +255,35 @@ public class InstallNoticeController extends BaseController { ...@@ -278,14 +255,35 @@ public class InstallNoticeController extends BaseController {
public ResponseModel<Boolean> deleteBySeq(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<Boolean> deleteBySeq(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
final InstallNoticeDto installNoticeDto = installNoticeServiceImpl.selectOneById(sequenceNbr); final InstallNoticeDto installNoticeDto = installNoticeServiceImpl.selectOneById(sequenceNbr);
final String noticeStatus = installNoticeDto.getNoticeStatus(); final String noticeStatus = installNoticeDto.getNoticeStatus();
if (noticeStatus.equals("已提交")||noticeStatus.equals("已保存")){ if (!noticeStatus.equals("已接收")){
return ResponseHelper.buildResponse(installNoticeServiceImpl.removeById(sequenceNbr)); return ResponseHelper.buildResponse(installNoticeServiceImpl.removeById(sequenceNbr));
} }
return null; return ResponseHelper.buildResponse(false);
} }
/** /**
* 查询当前登陆人所在单位下的可选告知申请的所有项目列表
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "查询当前登陆人所在单位下的所以项目列表", notes = "查询当前登陆人所在单位下的所以项目列表")
@GetMapping(value = "/getProjects")
public ResponseModel<List<Project>> getCompanyProjects(){
Long companyId = null;
//获取当前登陆人所在单位id
companyId = orgServiceImpl.getCompanyId();
if(ValidationUtil.isEmpty(companyId)){
return ResponseHelper.buildResponse(new ArrayList<>());
}
LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<Project>();
if (!ValidationUtil.isEmpty(companyId)) {
wrapper.eq(Project::getInstallationUnitId,companyId).eq(Project::getStatus,ProjectInitiationEnum.告知申请.getName());
}
return ResponseHelper.buildResponse(projectServiceImpl.list(wrapper));
}
/**
* 监察部门接受安装告知 * 监察部门接受安装告知
* @param sequenceNbr * @param sequenceNbr
* @return * @return
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java
View file @ ccbf779a
...@@ -112,7 +112,7 @@ public class ProjectController extends BaseController { ...@@ -112,7 +112,7 @@ public class ProjectController extends BaseController {
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表")
public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) {
...@@ -126,7 +126,7 @@ public class ProjectController extends BaseController { ...@@ -126,7 +126,7 @@ public class ProjectController extends BaseController {
* @param current 每页大小 * @param current 每页大小
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "项目信息表分页查询", notes = "项目信息表分页查询") @ApiOperation(httpMethod = "GET",value = "项目信息表分页查询", notes = "项目信息表分页查询")
public ResponseModel<Page<ProjectDto>> queryForPage( public ResponseModel<Page<ProjectDto>> queryForPage(
...@@ -266,5 +266,17 @@ public class ProjectController extends BaseController { ...@@ -266,5 +266,17 @@ public class ProjectController extends BaseController {
public ResponseModel<ProjectDto> getDetail(Long sequenceNbr){ public ResponseModel<ProjectDto> getDetail(Long sequenceNbr){
return ResponseHelper.buildResponse(projectServiceImpl.getDetail(sequenceNbr)); return ResponseHelper.buildResponse(projectServiceImpl.getDetail(sequenceNbr));
} }
/**
* 查询当前登陆的建设单位和组织机构代码
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "查询当前登陆的建设单位和组织机构代码", notes = "查询当前登陆的建设单位和组织机构代码")
@GetMapping(value = "/getConstructionInfo")
public ResponseModel <Map> getConstructionInfo(){
return ResponseHelper.buildResponse(orgServiceImpl.getConstructionInfo());
}
} }
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/VerifyController.java
View file @ ccbf779a
...@@ -139,11 +139,11 @@ public class VerifyController extends BaseController { ...@@ -139,11 +139,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectTubular") @GetMapping(value = "/selectTubular")
@ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表") @ApiOperation(httpMethod = "GET", value = "焊接管材检验信息列表", notes = "焊接管材检验信息列表")
public ResponseModel<Page<SmartListDto>> selectTubular(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectTubular(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前管材质量.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前管材质量.getStage(),page,smartListDto));
} }
/** cpp /** cpp
* *
...@@ -158,11 +158,11 @@ public class VerifyController extends BaseController { ...@@ -158,11 +158,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectWorker") @GetMapping(value = "/selectWorker")
@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表") @ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前人员.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前人员.getStage(),page,smartListDto));
} }
/** cpp /** cpp
...@@ -177,11 +177,11 @@ public class VerifyController extends BaseController { ...@@ -177,11 +177,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectFacility") @GetMapping(value = "/selectFacility")
@ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表") @ApiOperation(httpMethod = "GET", value = "查询焊接设备检验信息列表", notes = "查询焊接设备检验信息列表")
public ResponseModel<Page<SmartListDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectFacility(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前设备.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.焊前设备.getStage(),page,smartListDto));
} }
/** cpp /** cpp
* *
...@@ -195,11 +195,11 @@ public class VerifyController extends BaseController { ...@@ -195,11 +195,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectCraft") @GetMapping(value = "/selectCraft")
@ApiOperation(httpMethod = "GET", value = "查询焊接工艺检验信息列表", notes = "查询焊接工艺检验信息列表") @ApiOperation(httpMethod = "GET", value = "查询焊接工艺检验信息列表", notes = "查询焊接工艺检验信息列表")
public ResponseModel<Page<SmartListDto>> selectCraft(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectCraft(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.焊接工艺.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.焊接工艺.getStage(),page,smartListDto));
} }
/** cpp /** cpp
* *
...@@ -213,11 +213,11 @@ public class VerifyController extends BaseController { ...@@ -213,11 +213,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectVoltage") @GetMapping(value = "/selectVoltage")
@ApiOperation(httpMethod = "GET", value = "查询管道耐压检验信息列表", notes = "查询管道耐压检验信息列表") @ApiOperation(httpMethod = "GET", value = "查询管道耐压检验信息列表", notes = "查询管道耐压检验信息列表")
public ResponseModel<Page<SmartListDto>> selectVoltage(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectVoltage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.管道耐压.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.管道耐压.getStage(),page,smartListDto));
} }
/** cpp /** cpp
...@@ -232,11 +232,11 @@ public class VerifyController extends BaseController { ...@@ -232,11 +232,11 @@ public class VerifyController extends BaseController {
@GetMapping(value = "/selectLocation") @GetMapping(value = "/selectLocation")
@ApiOperation(httpMethod = "GET", value = "敷设位置标定检验列表", notes = "敷设位置标定检验列表") @ApiOperation(httpMethod = "GET", value = "敷设位置标定检验列表", notes = "敷设位置标定检验列表")
public ResponseModel<Page<SmartListDto>> selectLocation(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<SmartListDto>> selectLocation(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) { (value = "size") int size,SmartListDto smartListDto) {
Page<SmartListDto> page = new Page<>(); Page<SmartListDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(service.commonality(StageEnum.定位.getStage(),page)); return ResponseHelper.buildResponse(service.commonality(StageEnum.定位.getStage(),page, smartListDto));
} }
/** /**
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
View file @ ccbf779a
...@@ -3,9 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl; ...@@ -3,9 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.dto.DepartmentDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Company; import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper; import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService; import com.yeejoin.amos.boot.module.ugp.api.service.ICompanyService;
...@@ -17,24 +15,17 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; ...@@ -17,24 +15,17 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel; import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel; import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.privilege.util.DesUtil; import com.yeejoin.amos.feign.privilege.util.DesUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -71,18 +62,24 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company ...@@ -71,18 +62,24 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
/** /**
* 分页查询+筛选 * 分页查询+筛选
*/ */
public Page<CompanyDto> queryCompanyPage(int current, int size, CompanyDto companyDto) { public Page<CompanyDto> queryCompanyPage(int current, int size, Company company) {
Page<CompanyDto> page = new Page<>(); Page<CompanyDto> page = new Page<>();
page.setSize(size); page.setSize(size);
page.setCurrent(current); page.setCurrent(current);
Page<CompanyDto> page1 = queryForPage(page, null, false);
if (companyDto.getName() != null) { this.list();
List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList()); List<CompanyDto> companies = companyMapper.queryCompanyPage(company);
page1.setRecords(collect); // List<CompanyDto> companyDtos = new ArrayList<>();
} // BeanUtils.copyProperties(companies,companyDtos);
page.setRecords(companies);
// if (companyDto.getName() != null) {
// List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList());
// page1.setRecords(collect);
// }
return page1; return page;
} }
/** /**
...@@ -90,25 +87,24 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company ...@@ -90,25 +87,24 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
* @return * @return
*/ */
@BusinessIdentify @BusinessIdentify
public Boolean saveDepartment(DepartmentDto dto){ public Boolean saveDepartment(JSONObject jsonObject,String sequenceNbr){
if (ValidationUtil.isEmpty(dto)) { if (ValidationUtil.isEmpty(jsonObject)) {
return false; return false;
} }
if (ValidationUtil.isEmpty(sequenceNbr)) {
//平台添加 //平台添加
DepartmentModel departmentModel = new DepartmentModel( ); DepartmentModel departmentModel = new DepartmentModel( );
ReginParams reginParams = orgService.getReginParams(); ReginParams reginParams = orgService.getReginParams();
departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr()); departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr());
departmentModel.setDepartmentName(dto.getDepartmentName()); departmentModel.setDepartmentName(jsonObject.getString("name"));
departmentModel.setLevel("dept"); departmentModel.setLevel("dept");
departmentModel.setParentId(1L); departmentModel.setParentId(1L);
departmentModel = Privilege.departmentClient.create(departmentModel).getResult(); departmentModel = Privilege.departmentClient.create(departmentModel).getResult();
//业务添加 //业务添加
JSONObject jsonObject = new JSONObject( );
jsonObject.put("amosOrgId",departmentModel.getSequenceNbr()); jsonObject.put("amosOrgId",departmentModel.getSequenceNbr());
jsonObject.put("amosOrgCode",departmentModel.getOrgCode()); jsonObject.put("amosOrgCode",departmentModel.getOrgCode());
OrgUsrDto orgUsrDto = orgService.dataHandling(jsonObject, OrgEnum.部门.getKey( ), null); }
orgService.dataHandling(jsonObject, OrgEnum.部门.getKey(), sequenceNbr);
return true; return true;
} }
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java
View file @ ccbf779a
...@@ -39,6 +39,10 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -39,6 +39,10 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
InstallNoticeMapper installNoticeMapper; InstallNoticeMapper installNoticeMapper;
@Autowired @Autowired
ProjectServiceImpl projectServiceImpl; ProjectServiceImpl projectServiceImpl;
@Autowired
ProjectInitiationServiceImpl projectInitiationServiceImpl;
@Autowired
OrgServiceImpl orgServiceImpl;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -88,19 +92,20 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -88,19 +92,20 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
public InstallNoticeDto saveInstallNotice(JSONObject object, String noticeStatus ) { public InstallNoticeDto saveInstallNotice(JSONObject object, String noticeStatus ) {
InstallNoticeDto installNoticeDto = new InstallNoticeDto(); InstallNoticeDto installNoticeDto = new InstallNoticeDto();
// final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name")); final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name"));
installNoticeDto.setProjectId(object.getLong("name")); installNoticeDto.setProjectId(object.getLong("name"));
installNoticeDto.setNoticeStatus(noticeStatus); installNoticeDto.setNoticeStatus(noticeStatus);
installNoticeDto.setNoticeDate(new Date()); installNoticeDto.setNoticeDate(new Date());
installNoticeDto.setApproved(false); installNoticeDto.setApproved(false);
// installNoticeDto.setOrganizationCode(orgServiceImpl.getOrgUsr().getBizOrgCode()); installNoticeDto.setInstallPri(object.getString("installPri"));
installNoticeDto.setOrganizationCode(orgServiceImpl.getOrgUsr().getBizOrgCode());
installNoticeDto.setLicenseNum(object.getString("licenseNum")); installNoticeDto.setLicenseNum(object.getString("licenseNum"));
installNoticeDto.setLicenseCompany(object.getString("licenseCompany")); installNoticeDto.setLicenseCompany(object.getString("licenseCompany"));
final JSONArray licenseAttch = object.getJSONArray("licenseAttch"); final JSONArray licenseAttch = object.getJSONArray("licenseAttch");
final JSONArray contractAttch = object.getJSONArray("contractAttch"); final JSONArray contractAttch = object.getJSONArray("contractAttch");
installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch)); installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch));
installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch)); installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch));
// projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1"); projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1");
return installNoticeDto; return installNoticeDto;
} }
...@@ -120,6 +125,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -120,6 +125,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
jsonObject.put("licenseCompany",installNoticeDto.getLicenseCompany()); jsonObject.put("licenseCompany",installNoticeDto.getLicenseCompany());
jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch())); jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch()));
jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch())); jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch()));
jsonObject.put("installPri",installNoticeDto.getInstallPri());
return jsonObject; return jsonObject;
} }
} }
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java
View file @ ccbf779a
...@@ -18,6 +18,9 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnSer ...@@ -18,6 +18,9 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnSer
import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum; import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify; import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -29,6 +32,7 @@ import org.springframework.util.ObjectUtils; ...@@ -29,6 +32,7 @@ import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.component.cache.Redis; import org.typroject.tyboot.component.cache.Redis;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import java.util.*; import java.util.*;
...@@ -229,6 +233,18 @@ public class OrgServiceImpl { ...@@ -229,6 +233,18 @@ public class OrgServiceImpl {
} }
return map; return map;
} }
/**
* 获取当前登陆人的建设单位和建设单位的组织机构代码
* @return
*/
@BusinessIdentify
public Map getConstructionInfo(){
ReginParams reginParams = getReginParams();
ReginParams.BusinessInfo businessInfo = reginParams.getBusinessInfo();
Long companySequenceNbr = businessInfo.getCompanySequenceNbr();
return getdetialInfo(String.valueOf(companySequenceNbr));
}
/** /**
* 获取当前登陆人所在公司/单位/企业 下的 所有焊工人员 * 获取当前登陆人所在公司/单位/企业 下的 所有焊工人员
...@@ -236,7 +252,19 @@ public class OrgServiceImpl { ...@@ -236,7 +252,19 @@ public class OrgServiceImpl {
*/ */
public IPage getCompanyWelder(IPage page){ public IPage getCompanyWelder(IPage page){
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr())); wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
.eq(OrgUsr::getBizOrgType,OrgEnum.焊工.getKey());
return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
}
/**
* 获取当前登陆人所在公司/单位/企业 下的 所有部门
* @return
*/
public IPage getCompanyDept(IPage page){
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
.eq(OrgUsr::getBizOrgType,OrgEnum.部门.getKey());
return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page); return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
} }
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/SuperviseRuleServiceImpl.java
View file @ ccbf779a
...@@ -21,9 +21,6 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super ...@@ -21,9 +21,6 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
* 分页查询 * 分页查询
*/ */
public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId,Integer adminRegionCode) { public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId,Integer adminRegionCode) {
if(610000 == adminRegionCode){
return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId);
}
return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId,adminRegionCode ); return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId,adminRegionCode );
} }
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java
View file @ ccbf779a
...@@ -73,8 +73,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper ...@@ -73,8 +73,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
* stage 阶段 * stage 阶段
* page 分页 * page 分页
*/ */
public Page<SmartListDto> commonality(String stage,Page<SmartListDto> page){ public Page<SmartListDto> commonality(String stage,Page<SmartListDto> page,SmartListDto smartListDto){
List<Verify> verifyList = verifyMapper.commonality(stage); List<Verify> verifyList = verifyMapper.commonality(stage,smartListDto);
List<SmartListDto> dtoList =new ArrayList<>(); List<SmartListDto> dtoList =new ArrayList<>();
//进入焊前 //进入焊前
if (verifyList !=null && verifyList.size() !=0){ if (verifyList !=null && verifyList.size() !=0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment