解决冲突

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -41,6 +41,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	 */
 	TzBaseEnterpriseInfo selectByUseUnit(String useUnit);
 
-	@DataAuth(interfacePath = "enterprise")
+
 	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -76,6 +76,10 @@
 				test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
 				AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%') 
 			</if>
+		  <if
+				  test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
+			  AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%')
+		  </if>
 			AND is_delete = 0
 		</where>
 	</select>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsAppController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.tzs.api.common.MobileLoginParam;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -20,6 +32,8 @@ public class TzsAppController {
 
     @Autowired
     TzsAppService appService;
+    @Autowired
+    ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
     /**
      * 获取设计信息
@@ -54,4 +68,18 @@ public class TzsAppController {
         return ResponseHelper.buildResponse(appService.login(param));
     }
 
+  /**
+   * 小程序企业详情
+   * */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/details", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "小程序企业详情", notes = "小程序企业详情")
+    public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo( String unitCode) {
+        PageParam pageParam = new PageParam();
+        LambdaQueryWrapper<TzBaseEnterpriseInfo> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(!ValidationUtil.isEmpty(unitCode),TzBaseEnterpriseInfo::getUseCode,unitCode);
+        TzBaseEnterpriseInfo neInfo = iTzBaseEnterpriseInfoService.getOne(objectLambdaQueryWrapper, true);
+        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, neInfo.getUseUnit()));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -109,6 +110,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	/**机器人用户token缓存key */
 	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
+	@Autowired
+	private EquipmentCategoryServiceImpl equipmentCategoryService;
 
 	@Override
 	public List<EquEnterDto> getInfo(String sequenceNbr) {
@@ -125,6 +128,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 			}
 		}
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+		JSONObject companyType = equipmentCategoryService.getCompanyType();
+		String orgCode = companyType.getString("orgCode");
+		if (!ValidationUtil.isEmpty(orgCode)) {
+			tzBaseEnterpriseInfoDto.setSuperviseOrgCode(orgCode);
+		}
 		return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java

@@ -29,6 +29,9 @@ public class XJConstant {
     public static final String INSTALL_SUB_FORM_NEW = "[{\"Symbol_key\":\"B83A18D2-FF89-47D2-BEA2-BAA097E09783\",\"subFormInstall\":\"材质证明文件\",\"info\":\"\",\"type\":\"安装单位\"},{\"Symbol_key\":\"DB0306C1-3520-4BB4-93CE-44DA95AAD408\",\"subFormInstall\":\"焊接工艺评定报告\",\"info\":\"\",\"type\":\"安装单位\"},{\"Symbol_key\":\"DB0306C1-3520-4BB4-93CE-44DA95AAD409\",\"subFormInstall\":\"施工组织设计文件\",\"info\":\"\",\"type\":\"安装单位\"},{\"Symbol_key\":\"DB0306C1-3520-4BB4-93CE-44DA95AAD410\",\"subFormInstall\":\"合同文件\",\"info\":\"\",\"type\":\"安装单位\"}]";
     // 设计单位
     public static final String DESIGN_SUB_FORM_NEW = "[{\"Symbol_key\":\"314C727B-A6A7-40F1-9CFC-C354748657F7\",\"subFormAttachment\":\"设计文件\",\"info\":\"\",\"type\":\"设计单位\"},{\"Symbol_key\":\"5F3B660B-25A2-420C-919E-60F74CE1F36A\",\"subFormAttachment\":\"其他\",\"info\":\"\",\"type\":\"设计单位\"}]";
+
+    // 管材默认附件
+    public static final String MATERIAL_FILES = "[{\"name\":\"生产许可证\",\"code\":\"\",\"Symbol_key\":\"2F737BD0-9E53-42E4-8071-4258AAEA8115\",\"info\":[]},{\"name\":\"质量证明书\",\"code\":\"\",\"Symbol_key\":\"5CCD3225-9FAD-4AC8-9E68-B77A01FD7A02\",\"info\":[]},{\"name\":\"监检报告（管子）\",\"code\":\"\",\"Symbol_key\":\"6E0CD003-86A1-4942-9A8C-30FEDD09F535\",\"info\":[]},{\"name\":\"型式试验证书（管件）\",\"code\":\"\",\"Symbol_key\":\"DFF7932A-B68D-4982-80AB-A043D3A7D64A\",\"info\":[]}]";
     //人员org数值
     public static final int ORG_CODE=18;
     public static final int ORG_CODE_USER=12;

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

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialCount;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Material;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
@@ -297,4 +299,17 @@ public class MaterialController extends BaseController {
 		return ResponseHelper.buildResponse(object);
 	}
 
+	/**
+	 * 新增管材信息上传文件定义
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "getFiles")
+	@ApiOperation(httpMethod = "GET",value = "查询需要上传的附件信息",  notes = "查询需要上传的附件信息")
+	public ResponseModel<JSONObject> getFiles() {
+		JSONObject jsonObject = new JSONObject();
+		JSONArray designSubForm = JSON.parseArray(XJConstant.MATERIAL_FILES);
+		jsonObject.put("subForm", designSubForm);
+		return ResponseHelper.buildResponse(jsonObject);
+	}
 }