Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseExpertController.java

@@ -71,14 +71,14 @@ public class BaseExpertController extends BaseController {
     @PostMapping("/selectExpert")
     public AjaxResult selectExpert(@RequestBody BaseExpertVo baseExpertVo) {
         LambdaQueryWrapper<BaseExpert> lw = new LambdaQueryWrapper<BaseExpert>();
-        if (!StringUtils.isBlank(baseExpertVo.getExpertNameVo())) {
-            lw.like(BaseExpert::getExpertName, baseExpertVo.getExpertNameVo());
+        if (!StringUtils.isBlank(baseExpertVo.getExpertName())) {
+            lw.like(BaseExpert::getExpertName, baseExpertVo.getExpertName());
         }
-        if (!StringUtils.isBlank(baseExpertVo.getMajorTypeVo())) {
-            lw.eq(BaseExpert::getMajorType, baseExpertVo.getMajorTypeVo());
+        if (!StringUtils.isBlank(baseExpertVo.getMajorType())) {
+            lw.eq(BaseExpert::getMajorType, baseExpertVo.getMajorType());
         }
-        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGradeVo())) {
-            lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGradeVo());
+        if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGrade())) {
+            lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGrade());
         }
         IPage<BaseExpert> page = baseExpertService.page(new Page<BaseExpert>(baseExpertVo.getPageNum(), baseExpertVo.getPageSize()), lw);
         return success(page);

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -84,7 +84,7 @@ public class ProvisionalPlanController extends BaseController {
     @PostMapping("/updateProvisionalPlan")
     @PreAuthorize("@ss.hasPermi('base:provisionalPlan:updateProvisionalPlan')")
     @Log(title = ModularConstans.policy, businessType = BusinessType.UPDATE)
-    public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlan provisionalPlan) {
+    public AjaxResult updateProvisionalPlan(@RequestBody ProvisionalPlanVo provisionalPlan) {
         if (StringUtils.isNull(provisionalPlan) || StringUtils.isNull(provisionalPlan.getPlanPracticalId())) {
             return error("临时计划id和修改数据不能为空");
         }

purchase-system/src/main/java/com/ozs/base/domain/BaseExpert.java

@@ -2,6 +2,7 @@ package com.ozs.base.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.base.domain.vo.BaseExpertVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,6 +36,7 @@ public class BaseExpert {
     /**
      * 出生年月
      */
+    @JsonFormat(pattern = "yyyy-MM")
     @ApiModelProperty(value = "出生年月")
     @TableField("expert_date_birth")
     private String expertDateBirth;
@@ -87,4 +89,18 @@ public class BaseExpert {
     @ApiModelProperty(value = "状态 黑白名单")
     @TableField("status")
     private String status;
+
+    /**
+     * 所在区域
+     */
+    @ApiModelProperty(value = "所在区域")
+    @TableField("local_area")
+    private String localArea;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    @TableField("id_number")
+    private String idNumber;
 }

purchase-system/src/main/java/com/ozs/base/domain/BaseUnitInformation.java

@@ -0,0 +1,44 @@
+package com.ozs.base.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : sunhh
+ * @create 2023/2/2 17:59
+ */
+@Data
+@TableName("base_unit_information")
+public class BaseUnitInformation {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "id")
+    @TableField("id")
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称")
+    @TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    @TableField("created")
+    private String created;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+}

purchase-system/src/main/java/com/ozs/base/domain/vo/BaseExpertVo.java

@@ -1,18 +1,89 @@
 package com.ozs.base.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.vo.PageVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class BaseExpertVo extends PageVo {
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-    @ApiModelProperty("专家姓名")
-    private String expertNameVo;
-    @ApiModelProperty("专业类型")
-    private String majorTypeVo;
-    @ApiModelProperty("专业等级")
-    private String majorGradeVo;
-    @ApiModelProperty("采购品种")
-    private String varietyPurchaseVo;
+    /**
+     * 专家名称
+     */
+    @ApiModelProperty(value = "专家名称")
+    private String expertName;
+
+    /**
+     * 专家性别
+     */
+    @ApiModelProperty(value = "专家性别")
+    private String expertGender;
+
+    /**
+     * 出生年月
+     */
+    @JsonFormat(pattern = "yyyy-MM")
+    @ApiModelProperty(value = "出生年月")
+    private String expertDateBirth;
+
+    /**
+     * 联系方式
+     */
+    @ApiModelProperty(value = "联系方式")
+    private String expertTel;
+
+    /**
+     * 专业类型
+     */
+    @ApiModelProperty(value = "专业类型")
+    private String majorType;
+
+    /**
+     * 单位信息
+     */
+    @ApiModelProperty(value = "单位信息")
+    private String unitInformation;
+
+    /**
+     * 专业等级
+     */
+    @ApiModelProperty(value = "专业等级")
+    private String majorGrade;
+
+    /**
+     * 采购品种
+     */
+    @ApiModelProperty(value = "采购品种")
+    private String varietyPurchase;
+
+    /**
+     * 职称
+     */
+    @ApiModelProperty(value = "职称")
+    private String professionalTitle;
+
+    /**
+     * 状态 黑白名单
+     */
+    @ApiModelProperty(value = "状态 黑白名单")
+    private String status;
+
+    /**
+     * 所在区域
+     */
+    @ApiModelProperty(value = "所在区域")
+    private String localArea;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    private String idNumber;
 }

purchase-system/src/main/java/com/ozs/base/mapper/BaseExpertMapper.java

@@ -2,9 +2,17 @@ package com.ozs.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseUnitInformation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface BaseExpertMapper extends BaseMapper<BaseExpert> {
     int insertExpert(BaseExpert baseExpert);
+
+    List<BaseUnitInformation> selectByUnitInformation(@Param("unitInformation") String unitInformation);
+
+    Integer insertBaseUnitInformation(BaseUnitInformation baseUnitInformation);
 }

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -4,12 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.base.domain.BaseAgency;
 import com.ozs.base.domain.BaseExpert;
+import com.ozs.base.domain.BaseUnitInformation;
 import com.ozs.base.mapper.BaseExpertMapper;
 import com.ozs.base.mapper.BaseSupplierMapper;
 import com.ozs.base.service.BaseExpertService;
+import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExpert> implements BaseExpertService {
 
@@ -18,6 +24,18 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
 
     @Override
     public int insertExpert(BaseExpert baseExpert) {
+        // base_unit_information 单位信息表
+        if(StringUtils.isNotNull(baseExpert.getUnitInformation())) {
+            List<BaseUnitInformation> baseUnitInformationList = baseExpertMapper.selectByUnitInformation(baseExpert.getUnitInformation());
+            if (baseUnitInformationList.size() <= 0) {
+                BaseUnitInformation baseUnitInformation = new BaseUnitInformation();
+                baseUnitInformation.setUnitName(baseExpert.getUnitInformation());
+                baseUnitInformation.setCreated(baseExpert.getExpertName());
+                baseUnitInformation.setCreateTime(new Date());
+                Integer i = baseExpertMapper.insertBaseUnitInformation(baseUnitInformation);
+            }
+        }
+
         return baseExpertMapper.insertExpert(baseExpert);
     }
 

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
     int deleteProvisionalPlanById(@Param("planYearId") Integer planYearId);
 
-    int updateProvisionalPlanById(ProvisionalPlan provisionalPlan);
+    int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
     List<ProvisionalPlan> selectProjectName(String projectName);
 

purchase-system/src/main/java/com/ozs/plan/service/ProvisionalPlanService.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
     int deleteProvisionalPlanById(Integer planYearId);
 
-    int updateProvisionalPlanById(ProvisionalPlan provisionalPlan);
+    int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
     String importProvisionalPlan(List<ProvisionalPlan> provisionalPlans, boolean updateSupport, LoginUser loginUser);
 

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -59,7 +59,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     @Override
-    public int updateProvisionalPlanById(ProvisionalPlan provisionalPlan) {
+    public int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan) {
         return provisionalPlanMapper.updateProvisionalPlanById(provisionalPlan);
     }
 

purchase-system/src/main/resources/mapper/base/BaseExpertMapper.xml

@@ -15,6 +15,8 @@
         <result property="varietyPurchase" column="variety_purchase"/>
         <result property="professionalTitle" column="professional_title"/>
         <result property="status" column="status"/>
+        <result property="localArea" column="local_area"/>
+        <result property="idNumber" column="id_number"/>
     </resultMap>
 
     <insert id="insertExpert" parameterType="com.ozs.base.domain.BaseExpert">
@@ -47,7 +49,13 @@
             professional_title,
         </if>
         <if test="status != null and status != ''">
-            status
+            status,
+        </if>
+        <if test="localArea != null and localArea != ''">
+            local_area,
+        </if>
+        <if test="idNumber != null and idNumber != ''">
+            id_number
         </if>
         ) values (
         <if test="expertName != null and expertName != ''">
@@ -78,9 +86,48 @@
             #{professionalTitle},
         </if>
         <if test="status != null and status != ''">
-            #{status}
+            #{status},
+        </if>
+        <if test="localArea != null and localArea != ''">
+            #{localArea},
+        </if>
+        <if test="idNumber != null and idNumber != ''">
+            #{idNumber}
         </if>
         )
     </insert>
 
+    <select id="selectByUnitInformation" parameterType="java.lang.String"
+            resultType="com.ozs.base.domain.BaseUnitInformation">
+        select * from base_unit_information
+        <where>
+            <if test="unitInformation != null and unitInformation != ''">
+                unit_name = #{unitInformation}
+            </if>
+        </where>
+    </select>
+
+    <insert id="insertBaseUnitInformation" parameterType="com.ozs.base.domain.BaseUnitInformation">
+        insert into base_unit_information (
+        <if test="unitName != null and unitName != '' ">
+            unit_name,
+        </if>
+        <if test="created != null and created != '' ">
+            created,
+        </if>
+        <if test="createTime != null">
+            create_time
+        </if>
+        ) values (
+        <if test="unitName != null and unitName != ''">
+            #{unitName},
+        </if>
+        <if test="created != null and created != ''">
+            #{created},
+        </if>
+        <if test="createTime != null">
+            #{createTime}
+        </if>
+        )
+    </insert>
 </mapper>

purchase-system/src/main/resources/mapper/base/BaseSupplierMapper.xml

@@ -11,6 +11,16 @@
         <result property="supplierType" column="supplier_type"/>
         <result property="supplierState" column="supplier_state"/>
         <result property="supplierAdvancePurchase" column="supplier_advance_purchase"/>
+        <result property="postalCode" column="postal_code"/>
+        <result property="projectPerson" column="project_person"/>
+        <result property="telephone" column="telephone"/>
+        <result property="bankAccountName" column="bank_account_name"/>
+        <result property="bankOfDeposit" column="bank_of_deposit"/>
+        <result property="bankAccountNumber" column="bank_account_number"/>
+        <result property="created" column="created"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updated" column="updated"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <insert id="insertBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
@@ -31,7 +41,37 @@
             supplier_state,
         </if>
         <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
-            supplier_advance_purchase
+            supplier_advance_purchase,
+        </if>
+        <if test="postalCode != null and postalCode != ''">
+            postal_code,
+        </if>
+        <if test="projectPerson != null and projectPerson != ''">
+            project_person,
+        </if>
+        <if test="telephone != null and telephone != ''">
+            telephone,
+        </if>
+        <if test="bankAccountName != null and bankAccountName != ''">
+            bank_account_name,
+        </if>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">
+            bank_of_deposit,
+        </if>
+        <if test="bankAccountNumber != null and bankAccountNumber != ''">
+            bank_account_number,
+        </if>
+        <if test="created != null and created != ''">
+            created,
+        </if>
+        <if test="createTime != null and createTime != ''">
+            create_time,
+        </if>
+        <if test="updated != null and updated != ''">
+            updated,
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            update_time
         </if>
         ) values (
         <if test="supplierName != null and supplierName != ''">
@@ -50,13 +90,45 @@
             #{supplierState},
         </if>
         <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != ''">
-            #{supplierAdvancePurchase}
+            #{supplierAdvancePurchase},
+        </if>
+        <if test="postalCode != null and postalCode != ''">
+            #{postalCode},
+        </if>
+        <if test="projectPerson != null and projectPerson != ''">
+            #{projectPerson},
+        </if>
+        <if test="telephone != null and telephone != ''">
+            #{telephone},
+        </if>
+        <if test="bankAccountName != null and bankAccountName != ''">
+            #{bankAccountName},
+        </if>
+        <if test="bankOfDeposit != null and bankOfDeposit != ''">
+            #{bankOfDeposit},
+        </if>
+        <if test="bankAccountNumber != null and bankAccountNumber != ''">
+            #{bankAccountNumber},
+        </if>
+        <if test="created != null and created != ''">
+            #{created},
+        </if>
+        <if test="createTime != null and createTime != ''">
+            #{createTime},
+        </if>
+        <if test="updated != null and updated != ''">
+            #{updated},
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            #{updateTime}
         </if>
         )
     </insert>
 
     <delete id="deleteBaseSupplier" parameterType="java.lang.Integer">
-        delete from base_supplier where id = #{id}
+        delete
+        from base_supplier
+        where id = #{id}
     </delete>
 
     <update id="updateBaseSupplier" parameterType="com.ozs.base.domain.BaseSupplier">
@@ -80,6 +152,36 @@
             <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
                 supplier_advance_purchase = #{supplierAdvancePurchase},
             </if>
+            <if test="postalCode != null and postalCode != ''">
+                postal_code = #{postalCode},
+            </if>
+            <if test="projectPerson != null and projectPerson != ''">
+                project_person = #{projectPerson},
+            </if>
+            <if test="telephone != null and telephone != ''">
+                telephone = #{telephone},
+            </if>
+            <if test="bankAccountName != null and bankAccountName != ''">
+                bank_account_name = #{bankAccountName},
+            </if>
+            <if test="bankOfDeposit != null and bankOfDeposit != ''">
+                bank_of_deposit = #{bankOfDeposit},
+            </if>
+            <if test="bankAccountNumber != null and bankAccountNumber != ''">
+                bank_account_number = #{bankAccountNumber},
+            </if>
+            <if test="created != null and created != ''">
+                created = #{created},
+            </if>
+            <if test="createTime != null and createTime != ''">
+                create_time = #{createTime},
+            </if>
+            <if test="updated != null and updated != ''">
+                updated = #{updated},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -106,7 +208,37 @@
                 supplier_state = #{supplierState},
             </if>
             <if test="supplierAdvancePurchase != null and supplierAdvancePurchase != '' ">
-                supplier_advance_purchase = #{supplierAdvancePurchase}
+                supplier_advance_purchase = #{supplierAdvancePurchase},
+            </if>
+            <if test="postalCode != null and postalCode != ''">
+                postal_code = #{postalCode},
+            </if>
+            <if test="projectPerson != null and projectPerson != ''">
+                project_person = #{projectPerson},
+            </if>
+            <if test="telephone != null and telephone != ''">
+                telephone = #{telephone},
+            </if>
+            <if test="bankAccountName != null and bankAccountName != ''">
+                bank_account_name = #{bankAccountName},
+            </if>
+            <if test="bankOfDeposit != null and bankOfDeposit != ''">
+                bank_of_deposit = #{bankOfDeposit},
+            </if>
+            <if test="bankAccountNumber != null and bankAccountNumber != ''">
+                bank_account_number = #{bankAccountNumber},
+            </if>
+            <if test="created != null and created != ''">
+                created = #{created},
+            </if>
+            <if test="createTime != null and createTime != ''">
+                create_time = #{createTime},
+            </if>
+            <if test="updated != null and updated != ''">
+                updated = #{updated},
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                update_time = #{updateTime}
             </if>
         </where>
     </select>

purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -37,7 +37,7 @@
         where planPracticalId = #{plan_practical_id}
     </delete>
 
-    <update id="updateProvisionalPlanById" parameterType="com.ozs.plan.doman.ProvisionalPlan">
+    <update id="updateProvisionalPlanById" parameterType="com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo">
         update plan_practical
         <set>
             <if test="purchaseDeptId != null and purchaseDeptId != ''">
@@ -64,13 +64,13 @@
             <if test="purchaseMode != null and purchaseMode != '' ">
                 purchase_mode = #{purchaseMode},
             </if>
-            <if test="planDemandSubTime != null and planDemandSubTime != '' ">
+            <if test="planDemandSubTime != null">
                 plan_demand_sub_time = #{planDemandSubTime},
             </if>
-            <if test="planPurchaseFinishTime != null and planPurchaseFinishTime != '' ">
+            <if test="planPurchaseFinishTime != null">
                 plan_purchase_finish_time = #{planPurchaseFinishTime},
             </if>
-            <if test="planDeliverTime != null and planDeliverTime != '' ">
+            <if test="planDeliverTime != null">
                 plan_deliver_time = #{planDeliverTime},
             </if>
             <if test="projectAttr != null and projectAttr != '' ">
@@ -97,7 +97,7 @@
             <if test="updated != null and updated != '' ">
                 updated = #{updated},
             </if>
-            <if test="updateTime != null and updateTime != '' ">
+            <if test="updateTime != null">
                 update_time = #{updateTime}
             </if>
         </set>