计划单统计表增加对单人

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -108,8 +108,8 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                }
            }
            if((syCostLossReview.getRemarks()!=null && syCostLossReview.getRemarks()!="") ||
-                   (syCostLossReview.getPlanMan()!=null && syCostLossReview.getPlanMan()!="") ){
-               List<String> list= syCostLossReviewService.queryCodeByPlanTable(syCostLossReview.getRemarks(),syCostLossReview.getPlanMan());
+                   (syCostLossReview.getPlanMan()!=null && syCostLossReview.getPlanMan()!="") || oConvertUtils.isNotEmpty(syCostLossReview.getIsPlanMan())){
+               List<String> list= syCostLossReviewService.queryCodeByPlanTable(syCostLossReview.getRemarks(),syCostLossReview.getPlanMan(),syCostLossReview.getIsPlanMan());
                if(list.size()<1){
                    return Result.OK(nullList);
                }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/SyCostLossReview.java

@@ -75,7 +75,10 @@ public class SyCostLossReview {
 
 	private String id;
 
+	//对单人条件
 	private String planMan;
+	//是否有无对单人
+	private String isPlanMan;
 
 	private String remarks;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/SyCostLossReviewMapper.java

@@ -35,7 +35,7 @@ public interface SyCostLossReviewMapper extends BaseMapper<SyCostLossReview> {
 
     List<String> queryCodeByfstatus(@Param("status")String status,@Param("ffirstApproveDateB")String ffirstApproveDateB,@Param("ffirstApproveDateE")String ffirstApproveDateE);
     List<String> queryCodeBycstatus(@Param("status")String status);
-    List<String> queryCodeByPlanTable(@Param("remarks")String remarks,@Param("planMan")String planMan);
+    List<String> queryCodeByPlanTable(@Param("remarks")String remarks,@Param("planMan")String planMan,@Param("isPlanMan")String isPlanMan);
 
 
     //面损表列表修改审批状态

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -254,7 +254,7 @@
         submit_date as csubmitDate,reject_date as frejectDate,first_approve_date as ffirstApproveDate,
         final_approve_date as cfinalApproveDate,status as cstatus
         from sy_cost_json
-        where plan_num=#{planCode} and 1=1
+        where plan_num=#{planCode}
     </select>
 
 
@@ -336,8 +336,12 @@
         <if test="planMan!=null and planMan!=''">
             and plan_man LIKE CONCAT('%',#{planMan},'%')
         </if>
-
-
+        <if test='isPlanMan!=null and isPlanMan!="" and isPlanMan == "是"'>
+            and plan_man is not null
+        </if>
+        <if test='isPlanMan!=null and isPlanMan!="" and isPlanMan == "否"'>
+            and plan_man is null
+        </if>
     </select>
 
 <!--    面损表列表取消提交-->

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/ISyCostLossReviewService.java

@@ -26,7 +26,7 @@ public interface ISyCostLossReviewService extends IService<SyCostLossReview> {
      List<String> queryCodeBymaker(String maker);
      List<String> queryCodeByfstatus(String status,String ffirstApproveDateB,String ffirstApproveDateE);
      List<String> queryCodeBycstatus(String status);
-     List<String> queryCodeByPlanTable(String remarks,String planMan);
+     List<String> queryCodeByPlanTable(String remarks,String planMan,String isPlanMan);
 
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/impl/SyCostLossReviewServiceImpl.java

@@ -27,7 +27,6 @@ import java.util.List;
  * @Date:   2023-03-06
  * @Version: V1.0
  */
-@Transactional
 @Service
 public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMapper, SyCostLossReview> implements ISyCostLossReviewService {
 
@@ -36,6 +35,7 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     @Autowired
     private SyFabricLossReportServiceImpl syFabricLossReportService;
 
+
     @Override
     public IPage<SyCostLossReview> querylist(SyCostLossReview syCostLossReview,List<String> list, Page<SyCostLossReview> page) {
         return syCostLossReviewMapper.querylist(syCostLossReview,list, page);
@@ -82,8 +82,8 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     }
 
     @Override
-    public List<String> queryCodeByPlanTable(String remarks, String planMan) {
-        return syCostLossReviewMapper.queryCodeByPlanTable(remarks, planMan);
+    public List<String> queryCodeByPlanTable(String remarks, String planMan,String isPlanMan) {
+        return syCostLossReviewMapper.queryCodeByPlanTable(remarks, planMan,isPlanMan);
     }