大中型产品添加新字段

biz-base/src/main/java/com/dayou/controller/UserArchiveController.java

@@ -78,6 +78,16 @@ public class UserArchiveController extends BaseController {
         return RestResponse.data(ret);
     }
 
+    /**
+     * 查询估价师注册号
+     * @param userId
+     * @return
+     */
+    @GetMapping("/registrationNo/{userId}")
+    public RestResponse<UserArchive> getRegistrationNoByUserId(@PathVariable("userId") Long userId) {
+        UserArchive userRegistrationNos = userArchiveService.getRegistrationNoByUserId(userId);
+        return RestResponse.data(userRegistrationNos);
+    }
 
 }
 

dao/src/main/java/com/dayou/mapper/UserArchiveMapper.java

@@ -2,6 +2,7 @@ package com.dayou.mapper;
 
 import com.dayou.entity.UserArchive;
 import com.dayou.dao.CustomBaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.dayou.dao.CustomBaseMapper;
  */
 public interface UserArchiveMapper extends CustomBaseMapper<UserArchive> {
 
+    UserArchive getRegistrationNoByUserId(@Param("userId") Long userId);
 }

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -62,7 +62,7 @@
         mp.`owner`,
         mp.value_timing,
         mp.evaluate_acreage,
-        mp.evaluate_amount,
+        (mp.evaluate_amount/10000) as evaluateAmount,
         mp.evaluate_price,
         mp.`comment`,
         mp.qr_code,
@@ -76,7 +76,18 @@
         mp.file_path,
         m.`name` AS majorName,
         mp.checked_file_path,
-        mp.validate_code
+        mp.validate_code,
+        mp.is_submit,
+        mp.is_record,
+        mp.main_worker,
+        mp.main_worker_no,
+        mp.minor_worker,
+        mp.minor_worker_no,
+        mp.small_worker,
+        mp.small_worker_no,
+        mp.work_start_date,
+        mp.work_end_date,
+        mp.work_purpose
         FROM
             major_production mp
                 LEFT JOIN major m ON m.id = mp.major_id
@@ -121,7 +132,7 @@
         mp.`owner`,
         mp.value_timing,
         mp.evaluate_acreage,
-        mp.evaluate_amount,
+        (mp.evaluate_amount/10000) as evaluateAmount,
         mp.evaluate_price,
         mp.`comment`,
         mp.qr_code,
@@ -135,7 +146,18 @@
         mp.file_path,
         m.`name` AS majorName,
         mp.checked_file_path,
-        mp.validate_code
+        mp.validate_code,
+        mp.is_submit,
+        mp.is_record,
+        mp.main_worker,
+        mp.main_worker_no,
+        mp.minor_worker,
+        mp.minor_worker_no,
+        mp.small_worker,
+        mp.small_worker_no,
+        mp.work_start_date,
+        mp.work_end_date,
+        mp.work_purpose
         FROM
         major_production mp
         LEFT JOIN major m ON m.id = mp.major_id

dao/src/main/resources/mapper/UserArchiveMapper.xml

@@ -17,4 +17,14 @@
         user_id, major_evaluator_registration_no, land_evaluator_registration_no, asset_evaluator_registration_no
     </sql>
 
+    <select id="getRegistrationNoByUserId" parameterType="java.lang.Long" resultType="com.dayou.entity.UserArchive">
+        select
+                u.name as evaluatorName,
+                ua.user_id,
+               ua.major_evaluator_registration_no,
+               ua.land_evaluator_registration_no,
+               ua.asset_evaluator_registration_no
+                from user_archive ua inner join user u on u.id = ua.user_id
+            where u.deleted = 0 and ua.deleted = 0 and u.id = #{userId}
+    </select>
 </mapper>

domain/src/main/java/com/dayou/entity/MajorProduction.java

@@ -1,6 +1,7 @@
 package com.dayou.entity;
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dayou.annotation.*;
 import com.dayou.common.BaseEntity;
@@ -213,6 +214,65 @@ public class MajorProduction extends BaseEntity {
      */
     private BigDecimal standardAmount;
 
+    /**
+     * 估价作业开始日期
+     */
+    private LocalDate workStartDate;
+
+    /**
+     * 估价作业结束日期
+     */
+    private LocalDate workEndDate;
+
+    /**
+     * 估价目的
+     */
+    private String workPurpose;
+
+    /**
+     * 是否上报协会（房地产）
+     */
+    private Boolean isSubmit = true;
+
+    /**
+     * 是否备案（土地）
+     */
+    private Boolean isRecord = true;
+
+    /**
+     * 第一报告人
+     */
+    private String mainWorker;
+
+    /**
+     * 第一报告人注册号
+     */
+    private String mainWorkerNo;
+
+    /**
+     * 第二报告人
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String minorWorker;
+
+    /**
+     * 第二报告人注册号
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String minorWorkerNo;
+
+    /**
+     * 第三报告人
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String smallWorker;
+
+    /**
+     * 第三报告人注册号
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String smallWorkerNo;
+
 
     @TableField(exist = false)
     private List<Long> signatoryId;

domain/src/main/java/com/dayou/entity/UserArchive.java

@@ -1,4 +1,5 @@
 package com.dayou.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.dayou.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,5 +47,11 @@ public class UserArchive extends BaseEntity {
     @ExportCell(columnName = "资产评估师资格证号")
     private String assetEvaluatorRegistrationNo;
 
+    /**
+     * 评估师名称
+     */
+    @TableField(exist = false)
+    private String evaluatorName;
+
 
 }

service/src/main/java/com/dayou/service/IUserArchiveService.java

@@ -25,4 +25,5 @@ public interface IUserArchiveService extends IService<UserArchive> {
 
         Boolean delete(Long id);
 
+    UserArchive getRegistrationNoByUserId(Long userId);
 }

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -214,8 +214,8 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
 
         if (productionType.equals(REPORT.name())){
             List<Long> signatoryId = taskData.getSignatoryId();
-            if (signatoryId.size()!=2){
-                ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"签字人数必须为2人。");
+            if (signatoryId.size()>3){
+                ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"签字人数不能超过3人。");
             }
             taskData.setSignatory(JSON.toJSONString(signatoryId));
             taskData.setProduction(REPORT.name());
@@ -476,7 +476,13 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
 
     @Override
     public List<MajorProduction> getPendingList(MajorProduction majorProduction) {
-        return majorProductionMapper.getPendingList(majorProduction);
+        List<MajorProduction> list = majorProductionMapper.getPendingList(majorProduction);
+        if(CollectionUtils.isNotEmpty(list)){
+            list.stream().forEach(x->{
+                x.setSignatoryId(JSON.parseArray(x.getSignatory(),Long.class));
+            });
+        }
+        return list;
     }
 
     @Override

service/src/main/java/com/dayou/service/impl/UserArchiveServiceImpl.java

@@ -4,6 +4,7 @@ import com.dayou.entity.UserArchive;
 import com.dayou.mapper.UserArchiveMapper;
 import com.dayou.service.IUserArchiveService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -35,6 +36,8 @@ import com.dayou.enums.BatchTaskTypeEnum;
 @Service
 public class UserArchiveServiceImpl extends ServiceImpl<UserArchiveMapper, UserArchive> implements IUserArchiveService {
 
+    @Autowired
+    private UserArchiveMapper userArchiveMapper;
 
     @Override
     @SuppressWarnings("unchecked")
@@ -63,4 +66,9 @@ public class UserArchiveServiceImpl extends ServiceImpl<UserArchiveMapper, UserA
         //逻辑删除
         return this.removeById(id);
     }
+
+    @Override
+    public UserArchive getRegistrationNoByUserId(Long userId) {
+        return  userArchiveMapper.getRegistrationNoByUserId(userId);
+    }
 }

sql/update_sql.sql

@@ -694,3 +694,22 @@ CREATE TABLE `user_archive`  (
 ) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '员工档案' ROW_FORMAT = Dynamic;
 
 
+/**
+  日期：2024-09-05
+  修改人:吴长林
+  未更新到test-env
+ */
+ALTER TABLE `major_production` ADD work_start_date date NULL COMMENT '估价作业开始日期';
+ALTER TABLE `major_production` ADD work_end_date date NULL COMMENT '估价作业结束日期';
+ALTER TABLE `major_production` ADD work_purpose varchar(64) NULL COMMENT '估价目的';
+ALTER TABLE `major_production` ADD is_submit bit(1) NULL COMMENT '是否上报协会（房地产）';
+ALTER TABLE `major_production` ADD is_record bit(1) NULL COMMENT '是否备案（土地）';
+ALTER TABLE `major_production` ADD main_worker varchar(64) NULL COMMENT '第一报告人';
+ALTER TABLE `major_production` ADD main_worker_no varchar(64) NULL COMMENT '第一报告人注册号';
+ALTER TABLE `major_production` ADD minor_worker varchar(64) NULL COMMENT '第二报告人';
+ALTER TABLE `major_production` ADD minor_worker_no varchar(64) NULL COMMENT '第二报告人注册号';
+ALTER TABLE `major_production` ADD small_worker varchar(64) NULL COMMENT '第三报告人';
+ALTER TABLE `major_production` ADD small_worker_no varchar(64) NULL COMMENT '第三报告人注册号';
+
+
+