问题调整 订单添加过滤条件

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderDetailController.java

@@ -50,7 +50,7 @@ public class ProduceOrderDetailController {
     /**
      * 生产任务详情
      */
-    @PostMapping(value = {"/detail", "/beginWorkDetail"})
+    @PostMapping("/detail")
     public ProductionOrderDetailVo detail(@RequestBody ProductionOrderDetailDto dto) {
         return produceOrderDetailService.detail(dto);
     }
@@ -103,14 +103,6 @@ public class ProduceOrderDetailController {
     /**
      * 生产开工确认
      */
-    @PostMapping("/editBeginWork")
-    public void editBeginWork(@RequestBody ProductionOrderDetailDto dto) {
-        produceOrderDetailService.editBeginWork(dto);
-    }
-
-    /**
-     * 生产开工确认
-     */
     @PostMapping("/exportExcel")
     public void editBeginWork(@RequestBody ProduceOrderDetailSelectDto dto, HttpServletResponse httpServletResponse) {
         produceOrderDetailService.exportExcel(dto, httpServletResponse);

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProduceOrderDetailSelectDto.java

@@ -89,4 +89,9 @@ public class ProduceOrderDetailSelectDto extends BaseSelectDto {
      */
     private Long contractId;
 
+    /**
+     * 归属过滤
+     */
+    private Integer contractBelongType;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderDetailService.java

@@ -67,11 +67,6 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
      */
     void reportLockOrUnlockAll(ProductionOrderDetailDto dto);
 
-    /**
-     * 生产开工确认
-     */
-    void editBeginWork(ProductionOrderDetailDto dto);
-
     void beginWorkCheck(Long taskId);
 
     /**

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -7,7 +7,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.util.DateUtils;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
@@ -214,6 +213,8 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         //合同id过滤
         wrapper.eq("c.id", dto.getContractId());
 
+        //订单归属过滤
+        wrapper.eq("c.belong_type  ", dto.getContractBelongType());
 
         return wrapper;
     }
@@ -522,12 +523,6 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         );
     }
 
-    @DSTransactional
-    @Override
-    public void editBeginWork(ProductionOrderDetailDto dto) {
-        this.updateById(dto);
-    }
-
     @Override
     public void beginWorkCheck(Long taskId) {
         ProductionOrderDetail taskById = this.getById(taskId);

hx-oa/src/main/java/com/fjhx/oa/entity/promotion/po/PromotionApply.java

@@ -26,6 +26,7 @@ public class PromotionApply extends BasePo {
     /**
      * 10实习员工、20试用员工、30正式员工
      */
+    private Integer oldEmployeeType;
     private Integer employeeType;
     private BigDecimal probationRatio;
     private BigDecimal internshipRatio;

hx-oa/src/main/resources/mapper/promotion/PromotionApplyMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.oa.entity.promotion.vo.PromotionApplyVo">
         select pa.id,
                pa.user_id,
+               pa.old_employee_type,
                pa.employee_type,
                pa.promotion_date,
                pa.remark,