ugp焊工变更列表

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/OrgUser.java

+package com.yeejoin.amos.boot.module.ugp.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Author cpp
+ * @Description
+ * @Date 2023/7/18
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_org_usr")
+public class OrgUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @TableField("biz_org_name")
+    private String     bizOrgName;
+    @TableField("biz_org_code")
+    private String bizOrgCode;
+    @TableField("amos_org_id")
+    private String  amosOrgId;
+    @TableField("amos_org_code")
+    private String amosOrgCode;
+
+    @TableField("biz_org_type")
+    private String      bizOrgType;
+    @TableField("build_name")
+    private String buildName;
+    @TableField("build_id")
+    private String       buildId;
+    @TableField("parent_id")
+    private String  parentId;
+    @TableField("org_expand_attr1")
+    private String       orgExpandAttr1;
+    @TableField("org_expand_attr2")
+    private String orgExpandAttr2;
+    @TableField("org_expand_attr3")
+    private String        orgExpandAttr3;
+    @TableField("org_expand_attr4")
+    private String orgExpandAttr4;
+    @TableField("org_expand_attr5")
+    private String        orgExpandAttr5;
+    @TableField("org_expand_attr6")
+    private String orgExpandAttr6;
+    @TableField("org_expand_attr7")
+    private String       orgExpandAttr7;
+    @TableField("org_expand_attr8")
+    private String orgExpandAttr8;
+    @TableField("parent_name")
+    private String       parentName;
+    @TableField("code")
+    private String code;
+    @TableField("pcz_code")
+    private String        pczCode;
+    @TableField("pcz_name")
+    private String pczName;
+
+
+}
+
+

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/OrgUserMapper.java

+package com.yeejoin.amos.boot.module.ugp.api.mapper;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.entity.OrgUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+@Mapper
+public interface OrgUserMapper extends BaseMapper<OrgUser> {
+ Page<String>  getWelderChangeList(Page<String> page,@Param("projectId")String projectId);
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/OrgUserMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.OrgUserMapper">
+
+    <select id="getWelderChangeList"  resultType="java.lang.String">
+        SELECT
+           ur.sequence_nbr
+        FROM
+            cb_org_usr ur
+        WHERE
+            ur.biz_org_type = 'PERSON'
+          AND ur.org_expand_attr1 = 'WELDER'
+          AND ur.sequence_nbr NOT IN ( SELECT resource_id FROM tz_ugp_project_resource WHERE TYPE = 'welder' )
+          AND parent_id = ( SELECT installation_unit_id FROM tz_ugp_project tt WHERE tt.sequence_nbr = #{projectId} )
+    </select>
+
+</mapper>
\ 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/controller/VerifyController.java

@@ -163,7 +163,7 @@ public class VerifyController extends BaseController {
 	 * @return
 	 */
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectWorker")
 	@ApiOperation(httpMethod = "GET", value = "查询焊接人员检验信息列表", notes = "查询焊接人员检验信息列表")
 	public ResponseModel<Page<SmartListDto>> selectWorker(@RequestParam(value = "current") int current, @RequestParam

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -308,4 +308,19 @@ public class WelderController extends BaseController {
                                                        @RequestParam(value = "name", required = false) String name) {
         return ResponseHelper.buildResponse(welderServiceImpl.getWelderByProjectId(projectId, current, size, name, "all"));
     }
+
+
+    /**
+     * 焊工变更列表
+     * */
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "焊工变更列表", notes = "焊工变更列表")
+    @GetMapping(value = "/getWelderChangeList")
+    public ResponseModel<Object> getWelderChangeList(@RequestParam(value = "projectId") String projectId,
+                                                     @RequestParam(value = "current") int current,
+                                                     @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(welderServiceImpl.getWelderChangeList(projectId,current,size));
+    }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
 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.ugp.api.Enum.OrgEnum;
@@ -18,6 +21,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 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.api.mapper.CompanyMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.OrgUserMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.WelderMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -30,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,6 +45,9 @@ public class WelderServiceImpl {
     OrgServiceImpl orgService;
 
     @Autowired
+    OrgUserMapper orgUserMapper;
+
+    @Autowired
     ProjectServiceImpl projectService;
 
     @Autowired
@@ -60,7 +68,7 @@ public class WelderServiceImpl {
     @Autowired
     MaterialServiceImpl materialServiceImpl;
 
-    @Autowired
+    @Resource
     DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
 
 
@@ -269,4 +277,26 @@ public class WelderServiceImpl {
         return mapPage;
     }
 
+
+    public Page<Map<String, Object>> getWelderChangeList(String projectId,Integer current, Integer size) {
+        Page<Map<String, Object>> page = new Page<>(current,size);
+        //查询OrgUser的sequence_nbr
+        Page<String> welderChangeList = orgUserMapper.getWelderChangeList(new Page<String>(current,size), projectId);
+        LambdaQueryWrapper<DynamicFormInstance> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        List<Map<String, Object>> objects = new ArrayList<>();
+        for (String userSequenceNbr : welderChangeList.getRecords()) {
+            objectLambdaQueryWrapper.eq(DynamicFormInstance::getInstanceId,userSequenceNbr);
+            List<DynamicFormInstance> list = alertFormValueServiceImpl.list(objectLambdaQueryWrapper);
+            Map<String, Object> maps = new HashMap<>();
+            for (DynamicFormInstance dynamicFormInstance : list) {
+                maps.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
+            }
+            objects.add(maps);
+        }
+        page.setRecords(objects);
+        page.setTotal(welderChangeList.getTotal());
+        return page;
+
+    }
+
 }