解决冲突

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

@@ -42,6 +42,9 @@ public class PersonAccountDto extends BaseDto {
     @ApiModelProperty(value = "部门id")
     private Long departmentId;
 
+    @ApiModelProperty(value = "部门名称")
+    private String projectDepartmentName;
+
     @ApiModelProperty(value = "所属场站id")
     private Long projectId;
 

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

@@ -65,7 +65,7 @@ public class PersonBasicDto  extends BaseDto {
     private Date workTime;
 
     @ApiModelProperty(value = "组织机构id")
-    private String orgCode;
+    private String projectOrgCode;
 
     @ApiModelProperty(value = "人员头像")
     @TableField(typeHandler = FastjsonTypeHandler.class)

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

@@ -63,7 +63,7 @@ public class PersonUser {
     private Date workTime;
 
     @ApiModelProperty(value = "组织机构id")
-    private String orgCode;
+    private String projectOrgCode;
 
     @ApiModelProperty(value = "人员头像")
     @TableField(typeHandler = FastjsonTypeHandler.class)

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

@@ -76,7 +76,7 @@ public class StationBasicDto extends BaseDto {
     private String areaName;
 
     @ApiModelProperty(value = "组织机构")
-    private String orgCode;
+    private String projectOrgCode;
 
     @ApiModelProperty(value = "岗位")
     private String postName;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAccount.java

@@ -90,8 +90,8 @@ public class PersonAccount extends BaseEntity {
      */
     @TableField("department_id")
     private Long departmentId;
-    @TableField("department_name")
-    private String departmentName;
+    @TableField("project_department_name")
+    private String projectDepartmentName;
 
     /**
      * 姓名

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java

@@ -126,8 +126,8 @@ public class PersonBasic extends BaseEntity {
     /**
      * 组织机构id
      */
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("project_org_code")
+    private String projectOrgCode;
 
     /**
      * 进入本单位工作时间

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java

@@ -124,8 +124,8 @@ public class StationBasic extends BaseEntity {
     @TableField("area")
     private String area;
     
-    @TableField("org_code")
-    private String orgCode;
+    @TableField("project_org_code")
+    private String projectOrgCode;
     @TableField(exist =false)
     private List<StationCoordinate> stationCoordinate;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -21,7 +21,7 @@
         <where>
             person_basic.is_delete=0
             <if test="orgCode != null and orgCode != ''">
-                AND person_basic.org_code like concat('%',#{orgCode},'%')
+                AND person_basic.project_org_code like concat('%',#{orgCode},'%')
             </if>
             <if test="name != null and name != ''">
                 AND person_basic.name like concat('%',#{name},'%')
@@ -47,7 +47,7 @@
         <where>
             person_basic.is_delete=0
             <if test="orgCode != null and orgCode != ''">
-                AND person_basic.org_code like concat('%',#{orgCode},'%')
+                AND person_basic.project_org_code like concat('%',#{orgCode},'%')
             </if>
             <if test="name != null and name != ''">
                 AND person_basic.name like concat('%',#{name},'%')

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -27,7 +27,7 @@
             AND station_basic.station_type = #{stationType}
         </if>
         <if test="orgCoce != null and orgCoce != ''">
-            AND station_basic.org_code like concat('%',#{orgCoce},'%')
+            AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
         </if>
         </where>
         ORDER BY  station_basic.rec_date DESC
@@ -51,7 +51,7 @@
                 AND station_basic.station_type = #{stationType}
             </if>
             <if test="orgCoce != null and orgCoce != ''">
-                AND station_basic.org_code like concat('%',#{orgCoce},'%')
+                AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
             </if>
         </where>
     </select>
@@ -97,7 +97,7 @@
                 AND station_basic.station_type = #{stationType}
             </if>
             <if test="orgCoce != null and orgCoce != ''">
-                AND station_basic.org_code like concat('%',#{orgCoce},'%')
+                AND station_basic.project_org_code like concat('%',#{orgCoce},'%')
             </if>
         </where>
         ORDER BY  station_basic.rec_date DESC

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

@@ -36,12 +36,12 @@ public class ExcelController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "下载模板")
     @GetMapping("/download/template/{type}")
-    public void downloadTemplate(HttpServletResponse response, @PathVariable(value = "type") String type) {
+    public void downloadTemplate(HttpServletResponse response, @PathVariable(value = "type") String type, @RequestParam Map par) {
         try {
             ExcelEnums excelEnums = ExcelEnums.getByKey(type);
             ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(),
                     excelEnums.getClassUrl(), excelEnums.getType());
-            excelService.templateExport(response, excelDto);
+            excelService.templateExport(response, excelDto,par);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");

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

@@ -119,9 +119,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser,personBasic);
         if(departmentModel!=null){
-            personBasic.setOrgCode(departmentModel.getOrgCode());
+            personBasic.setProjectOrgCode(departmentModel.getOrgCode());
         }else{
-            personBasic.setOrgCode(companyModel.getOrgCode());
+            personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
         this.baseMapper.insert(personBasic);
         //人员技能学历信息
@@ -135,7 +135,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //人员账号信息
         personAccount.setPersonId(personBasic.getSequenceNbr());
         personAccount.setPuserId(agencyUserModel.getUserId());
-        personAccount.setDepartmentName(departmentModel.getDepartmentName());
+        personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
         personAccount.setProjectName(companyModel.getCompanyName());
         personAccountService.save(personAccount);
     }
@@ -195,9 +195,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         personBasic.setSequenceNbr(sequenceNbr);
         BeanUtils.copyProperties(personUser, personBasic);
         if(departmentModel!=null){
-            personBasic.setOrgCode(departmentModel.getOrgCode());
+            personBasic.setProjectOrgCode(departmentModel.getOrgCode());
         }else{
-            personBasic.setOrgCode(companyModel.getOrgCode());
+            personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
         this.personBasicMapper.updateById(personBasic);
 
@@ -211,7 +211,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         personCertificateService.updateById(personCertificate);
         //人员账号信息
         personAccount.setPersonId(sequenceNbr);
-        personAccount.setDepartmentName(departmentModel.getDepartmentName());
+        personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
         personAccount.setProjectName(companyModel.getCompanyName());
         personAccountService.updateById(personAccount);
         return model;

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

@@ -88,7 +88,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         //单位
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
-        stationBasic.setOrgCode(companyModel.getOrgCode());
+        stationBasic.setProjectOrgCode(companyModel.getOrgCode());
         //场站基本信息
         this.save(stationBasic);
 
@@ -115,7 +115,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         //单位
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
-        stationBasic.setOrgCode(companyModel.getOrgCode());
+        stationBasic.setProjectOrgCode(companyModel.getOrgCode());
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);