解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvImport.java

@@ -7,43 +7,43 @@ import lombok.Data;
 @Data
 public class HouseholdPvImport {
     @ColumnWidth(15)
-    @ExcelProperty(value = "所属场站", index = 0)
+    @ExcelProperty(value = "所属场站", index = 1)
     private String platformCompanyId;
     @ColumnWidth(15)
-    @ExcelProperty(value = "乡镇", index = 1)
+    @ExcelProperty(value = "乡镇", index = 2)
     private String districtId;
     @ColumnWidth(15)
-    @ExcelProperty(value = "户号", index = 2)
+    @ExcelProperty(value = "户号", index = 3)
     private String number;
     @ColumnWidth(15)
-    @ExcelProperty(value = "户主姓名", index = 3)
+    @ExcelProperty(value = "户主姓名", index = 4)
     private String name;
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 4)
+    @ExcelProperty(value = "性别", index = 5)
     private String sex;
     @ColumnWidth(15)
-    @ExcelProperty(value = "身份证号", index = 5)
+    @ExcelProperty(value = "身份证号", index = 6)
     private String idNumber;
     @ColumnWidth(20)
-    @ExcelProperty(value = "证件过期时间", index = 6)
+    @ExcelProperty(value = "证件过期时间", index = 7)
     private String expiryTime;
     @ColumnWidth(15)
-    @ExcelProperty(value = "签发机关", index = 7)
+    @ExcelProperty(value = "签发机关", index = 8)
     private String issuingAuthority;
     @ColumnWidth(15)
-    @ExcelProperty(value = "户籍地址", index = 8)
+    @ExcelProperty(value = "户籍地址", index = 9)
     private String residenceAddress;
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号码", index = 9)
+    @ExcelProperty(value = "手机号码", index = 10)
     private String phone;
     @ColumnWidth(15)
-    @ExcelProperty(value = "居住地", index = 10)
+    @ExcelProperty(value = "居住地", index = 11)
     private String address;
     @ColumnWidth(15)
-    @ExcelProperty(value = "居住地邮编", index = 11)
+    @ExcelProperty(value = "居住地邮编", index = 12)
     private String postcode;
     @ColumnWidth(15)
-    @ExcelProperty(value = "送达地址", index = 12)
+    @ExcelProperty(value = "送达地址", index = 13)
     private String serviceAddress;
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvController.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvServiceImp
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -156,7 +157,7 @@ public class HouseholdPvController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "模板下载", notes = "模板下载")
     public void exportTemplates(HttpServletResponse response) {
-        FileUtil.downloadResource("户用光伏导入模板.xlsx", "templates/householdTemplates.xls", response);
+        FileUtil.downloadResource("户用光伏导入模板.xlsx", "templates/householdTemplatesNew.xls", response);
     }
 
 
@@ -176,7 +177,7 @@ public class HouseholdPvController extends BaseController {
 
 
 
-    @GetMapping(value = "/exportData")
+    @GetMapping(value = "/exportDataOld")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "数据导出", notes = "数据导出")
     public void exportMessage(HttpServletResponse response, HouseholdPvDto dto) throws IOException {
@@ -231,7 +232,48 @@ public class HouseholdPvController extends BaseController {
         }
     }
 
-
+    @GetMapping(value = "/exportData")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "数据导出", notes = "数据导出")
+    public void exportMessageNew(HttpServletResponse response, HouseholdPvDto dto) throws IOException {
+        try {
+            ClassPathResource cpr = new ClassPathResource("templates/householdExportNew.xls");
+            InputStream is = cpr.getInputStream();
+            Workbook workbook = new XSSFWorkbook(is);
+            Sheet sheet = workbook.getSheetAt(0);
+            List<HouseholdPvExport> list = iHouseholdPvService.selectExportList(dto, dto.getIds());
+            // 序号
+            int num = 1;
+            for (HouseholdPvExport item : list) {
+                // 获取当前插入数据行号
+                int lastRowNum = sheet.getLastRowNum() + 1;
+                Row row = sheet.createRow((short) (lastRowNum));
+                row.createCell(0).setCellValue(num);
+                num++;
+                row.createCell(1).setCellValue(ObjectUtils.isEmpty(item.getNumber()) ? "" : item.getNumber());
+                row.createCell(2).setCellValue(ObjectUtils.isEmpty(item.getName()) ? "" : item.getName());
+                row.createCell(3).setCellValue(ObjectUtils.isEmpty(item.getIdNumber()) ? "" : item.getIdNumber());
+                row.createCell(4).setCellValue(ObjectUtils.isEmpty(item.getPhone()) ? "" : item.getPhone());
+                row.createCell(5).setCellValue(ObjectUtils.isEmpty(item.getInstallAddress()) ? "" : item.getInstallAddress());
+                // 安装总功率
+                if (!ObjectUtils.isEmpty(item)&& !ObjectUtils.isEmpty(item.getActualCapacity()) && !ObjectUtils.isEmpty(item.getInstallCount())) {
+                    row.createCell(6).setCellValue(Math.multiplyExact(Long.valueOf(item.getActualCapacity()),Long.valueOf(item.getInstallCount())));
+                } else {
+                    row.createCell(6).setCellValue(0);
+                }
+                row.createCell(7).setCellValue(ObjectUtils.isEmpty(item.getContactNumber()) ? "" : item.getContactNumber());
+                row.createCell(8).setCellValue(ObjectUtils.isEmpty(item.getGenerationNumber()) ? "" : item.getGenerationNumber());
+                row.createCell(9).setCellValue(ObjectUtils.isEmpty(item.getInverterSerialNumber()) ? "" : item.getInverterSerialNumber());
+            }
+            response.setCharacterEncoding("UTF-8");
+            response.setHeader("content-Type", "application/vnd.ms-excel");
+            response.setHeader("Content-Disposition",
+                    "attachment;filename=\"" + URLEncoder.encode("户用光伏信息.xls", "UTF-8") + "\"");
+            workbook.write(response.getOutputStream());
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java

@@ -176,9 +176,9 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 			if (ObjectUtils.isEmpty(dto.getPostcode())) {
 				return "第 " + line + " 行居住地邮编不能为空！";
 			}
-			if (ObjectUtils.isEmpty(dto.getServiceAddress())) {
-				return "第 " + line + " 行送达地址不能为空！";
-			}
+//			if (ObjectUtils.isEmpty(dto.getServiceAddress())) {
+//				return "第 " + line + " 行送达地址不能为空！";
+//			}
 			// 导入文件中数据校验
 			List<HouseholdPvImport> collect = list.stream().filter(item -> dto.getNumber().equals(item.getNumber())).collect(Collectors.toList());
 			if (!ObjectUtils.isEmpty(collect) && collect.size() >= 2) {
@@ -220,9 +220,9 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 			if (dto.getPostcode().length() > 10) {
 				return "第" + line + " 行居住地邮编最多输入10个字符！";
 			}
-			if (dto.getServiceAddress().length() > 200) {
-				return "第" + line + " 行送达地址最多输入200个字符！";
-			}
+//			if (dto.getServiceAddress().length() > 200) {
+//				return "第" + line + " 行送达地址最多输入200个字符！";
+//			}
 			if (dto.getResidenceAddress().length() > 400) {
 				return "第" + line + " 户籍地址最多输入400个字符！";
 			}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
-
-import java.util.Date;
-import java.util.List;
-
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
-
-
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +17,7 @@ import java.util.List;
  * @date 2022-07-26
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TzBaseEnterpriseInfoDto extends BaseDto {
 
 	private static final long serialVersionUID = 1L;
@@ -222,6 +217,13 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 * 核准时间
 	 */
 	private Date approvalTime;
+
+	/**
+	 * 核准时间(企业端基础信息使用)
+	 */
+	@ApiModelProperty(value = "核准时间")
+	private String approval;
+
 	@ApiModelProperty(value = "经营状态")
 	/**
 	 * 经营状态
@@ -258,6 +260,25 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 */
 	private String technicalPerson;
 
+	@ApiModelProperty(value = "涉及设备类型")
+	private List equipCategory;
+
+	@ApiModelProperty(value = "企业营业执照")
+	private List unitBusinessLicense;
+
+	@ApiModelProperty(value = "企业许可证书")
+	private List unitExequatur;
+
+	@ApiModelProperty(value = "安全管理人2身份证照片")
+	private List safetyTwoPhoto;
+
+	@ApiModelProperty(value = "安全管理人1身份证照片")
+	private List safetyOnePhoto;
+
+	@ApiModelProperty(value = "质量保证工程师电话")
+	private String sqaPhone;
+
+
 	private String region;
 
 	private String fullAddress;
@@ -265,6 +286,11 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	private String superviseKey;
 
 	private List<BaseUnitLicenceDto> unitLicences;
-	
+
 	private RegUnitIcDto regUnitIcDto;
+	//企业管理员信息
+	private RegUnitInfoDto regUnitInfoDto;
+
+
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java

 package com.yeejoin.amos.boot.module.tzs.api.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -10,11 +8,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-
 import java.util.Date;
 
 
-
 /**
  * 企业数据信息
  *
@@ -162,5 +158,23 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
     @ApiModelProperty(value = "技术负责人")
     private String technicalPerson;
 
+    @ApiModelProperty(value = "涉及设备类型")
+    private String equipCategory;
+
+    @ApiModelProperty(value = "企业营业执照")
+    private String unitBusinessLicense;
+
+    @ApiModelProperty(value = "企业许可证书")
+    private String unitExequatur;
+
+    @ApiModelProperty(value = "安全管理人2身份证照片")
+    private String safetyTwoPhoto;
+
+    @ApiModelProperty(value = "安全管理人1身份证照片")
+    private String safetyOnePhoto;
+
+    @ApiModelProperty(value = "质量保证工程师电话")
+    private String sqaPhone;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业数据信息 服务类
@@ -28,10 +29,13 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 
 	TzBaseEnterpriseInfoDto detail(Long id);
+	IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, String companyName);
 
 	List<EquEnterDto> getInfoByUseUnit(String useUnit);
 
 	TzBaseEnterpriseInfoDto selectByUseUnit(String useUnit);
 
 	String syncEnterpriseInfo();
+
+	TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitIcDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -57,5 +56,7 @@ public class RegUnitIcDto  extends BaseDto {
    private String province;
    private String city;
    private String district;
+   private String registerAddress;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,6 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="RegUnitInfoDto", description="单位注册信息表")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RegUnitInfoDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
@@ -109,6 +109,9 @@ public class RegUnitInfoDto  extends BaseDto {
     @ApiModelProperty(value = "管理员身份证号")
     private String adminIdNumber;
 
+    @ApiModelProperty(value = "身份证照片（正反面）")
+    private List adminIdCardPhoto;
+
     @ApiModelProperty(value = "审核状态：1-无需审核；2-待审核；3-已审核")
     private String state;
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/RegUnitInfo.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 单位注册信息表
  *
@@ -199,4 +201,9 @@ public class RegUnitInfo extends BaseEntity {
      */
     private String adminUserId;
 
+    /**
+     * 身份证照片（正反面）
+     */
+    private List adminIdCardPhoto;
+
 }

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
 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.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 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.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -25,6 +29,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业数据信息
@@ -40,6 +45,9 @@ public class TzBaseEnterpriseInfoController {
 	@Autowired
 	ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
+	@Autowired
+	RedisUtils redisUtils;
+
 	/**
 	 * 新增企业数据信息
 	 * 
@@ -162,10 +170,28 @@ public class TzBaseEnterpriseInfoController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据id查询企业详情", notes = "根据id查询企业详情")
+	public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam,Long id) {
+		ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		if(ObjectUtils.isEmpty(reginParams)){
+			return null;
+		}
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, reginParams.getCompany().getCompanyName()));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyInfoUpdate", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "修改企业信息", notes = "修改企业信息")
+	public ResponseModel<TzBaseEnterpriseInfoDto> companyInfoUpdate(@RequestBody Map<String,Object> map) {
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.companyInfoUpdate(map));
+	}
+
 	/**
 	 * 根据企业名称查询企业详情
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)