处理专家库bug

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

@@ -101,6 +101,7 @@ public class BaseExpertController extends BaseController {
         if (!ObjectUtils.isEmpty(baseExpertVo.getMajorGrade())) {
             lw.eq(BaseExpert::getMajorGrade, baseExpertVo.getMajorGrade());
         }
+        lw.orderBy(true, false, BaseExpert::getCreateTime);
         List<BaseExpert> list = baseExpertService.list(lw);
         // IPage<BaseExpert> page = baseExpertService.page(new Page<BaseExpert>(baseExpertVo.getPageNum(), baseExpertVo.getPageSize()), lw);
         // List<BaseExpert> records = page.getRecords();

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

@@ -448,7 +448,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         }
         PmDemand demand = new PmDemand();
         BeanUtils.copyProperties(byId, demand);
-        demand.setPlanId(byId.getPlanPracticalId());
+        demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
         demand.setEvaluation(byId.getEvaluation().doubleValue());
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         //同步到项目管理状态为需求待填制

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

@@ -25,6 +25,9 @@
             <if test="expertName != null and expertName != '' ">
                 expert_name,
             </if>
+            <if test="expertType != null and expertType != ''">
+                expert_type,
+            </if>
             <if test="expertGender != null and expertGender != '' ">
                 expert_gender,
             </if>
@@ -58,11 +61,15 @@
             <if test="idNumber != null and idNumber != ''">
                 id_number,
             </if>
+            status
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="expertName != null and expertName != ''">
                 #{expertName},
             </if>
+            <if test="expertType != null and expertType != ''">
+                #{expertType},
+            </if>
             <if test="expertGender != null and expertGender != ''">
                 #{expertGender},
             </if>
@@ -96,7 +103,9 @@
             <if test="idNumber != null and idNumber != ''">
                 #{idNumber},
             </if>
+            1
         </trim>
+
     </insert>
 
     <select id="selectByUnitInformation" parameterType="java.lang.String"
@@ -134,4 +143,4 @@
             </if>
         </trim>
     </insert>
-</mapper>
+</mapper>