生产订单查看已派发工时

@@ -18,6 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblProductType;
 import org.jeecg.modules.erp.order_form.entity.TblProductType;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
@@ -86,9 +87,9 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 								   HttpServletRequest req) {
-		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
+//		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 		Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
 		Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
-		IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
+		IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page, tblOrderForm);
 		return Result.OK(pageList);
 		return Result.OK(pageList);
 	}
 	}
 
 

@@ -69,6 +69,10 @@ public class TblOrderForm implements Serializable {
     @ApiModelProperty(value = "产品名称")
     @ApiModelProperty(value = "产品名称")
     private java.lang.String productName;
     private java.lang.String productName;
 
 
+    @Excel(name = "产品类型id", width = 15)
+    @ApiModelProperty(value = "产品类型id")
+    private java.lang.String productTypeId;
+
     @Excel(name = "产品类型", width = 15)
     @Excel(name = "产品类型", width = 15)
     @ApiModelProperty(value = "产品类型")
     @ApiModelProperty(value = "产品类型")
     private java.lang.String productType;
     private java.lang.String productType;

 package org.jeecg.modules.erp.order_form.mapper;
 package org.jeecg.modules.erp.order_form.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 
 
 import java.util.List;
 import java.util.List;
@@ -22,4 +25,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 
 
+    Page<TblOrderForm>  selectList(Page<TblOrderForm> page,@Param("qc") TblOrderForm tblOrderForm);
+
 }
 }

@@ -20,16 +20,16 @@
             NOW())>= 0
             NOW())>= 0
         AND STATUS = '生产中'
         AND STATUS = '生产中'
 	</select>
 	</select>
-    <select id="selectAll" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
-        SELECT
-            a.id,a.create_by,a.create_time,a.update_by,a.update_time,a.sys_org_code,a.order_id,a.order_company,
-	        a.work_order,a.product_name,b.product_type_name as product_type,a.order_date,a.designer,
-	        a.dispatch_date,a.delivery_date,a.quantity,a.total_working_hours,a.dispatched_working_hours,a.STATUS,
-	        a.finish_date,a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.pics2
-        FROM
-            tbl_order_form a
-            LEFT JOIN tbl_product_type b on a.product_type = b.product_type_id
-    </select>
+<!--    <select id="selectAll" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">-->
+<!--        SELECT-->
+<!--            a.id,a.create_by,a.create_time,a.update_by,a.update_time,a.sys_org_code,a.order_id,a.order_company,-->
+<!--	        a.work_order,a.product_name,b.product_type_name as product_type,a.order_date,a.designer,-->
+<!--	        a.dispatch_date,a.delivery_date,a.quantity,a.total_working_hours,a.dispatched_working_hours,a.STATUS,-->
+<!--	        a.finish_date,a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.pics2-->
+<!--        FROM-->
+<!--            tbl_order_form a-->
+<!--            LEFT JOIN tbl_product_type b on a.product_type = b.product_type_id-->
+<!--    </select>-->
     <select id="getCountByType" parameterType="java.lang.String" resultType="java.lang.Integer">
     <select id="getCountByType" parameterType="java.lang.String" resultType="java.lang.Integer">
         SELECT
         SELECT
            count(product_type)
            count(product_type)
@@ -55,4 +55,32 @@
     <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
     <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
        update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId}
        update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId}
     </update>
     </update>
+    <select id="selectList" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
+        SELECT
+            a.id,a.create_by,a.create_time,a.update_by,a.update_time,
+            a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type_id,c.product_type_name as product_type,a.order_date,a.design_role,a.designer,a.dispatch_date,
+            a.delivery_date,a.quantity,a.total_working_hours,if(b.dispatched_working_hours != 0,b.dispatched_working_hours,0) dispatched_working_hours,a.STATUS,a.finish_date,a.assign_design_status,
+            a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2
+        FROM
+            tbl_order_form a
+            LEFT JOIN ( SELECT order_number, sum( work_hours ) dispatched_working_hours FROM tbl_production_gongxu GROUP BY order_number ) b ON a.order_id = b.order_number
+						left join tbl_product_type c on a.product_type = c.product_type_id
+        where 1=1
+        <if test="qc.designer!=null and qc.designer !=''">
+            and a.designer like concat('%',#{qc.designer},'%')
+        </if>
+        <if test="qc.orderCompany!=null and qc.orderCompany !=''">
+            and a.order_company like concat('%',#{qc.orderCompany},'%')
+        </if>
+        <if test="qc.workOrder!=null and qc.workOrder !=''">
+            and a.work_order like concat('%',#{qc.workOrder},'%')
+        </if>
+        <if test="qc.workOrder!=null and qc.workOrder !=''">
+            and a.work_order like concat('%', #{biddingShenqForm.workOrder}, '%')
+        </if>
+        <if test="qc.productType!=null and qc.productType !=''">
+            and c.product_type_id like concat('%', #{qc.productType}, '%')
+        </if>
+        order by a.create_time desc
+    </select>
 </mapper>
 </mapper>

 package org.jeecg.modules.erp.order_form.service;
 package org.jeecg.modules.erp.order_form.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
@@ -39,4 +41,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 
 
+	Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm);
+
 }
 }

 package org.jeecg.modules.erp.order_form.service.impl;
 package org.jeecg.modules.erp.order_form.service.impl;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper;
 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper;
@@ -68,4 +69,9 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
 		return tblOrderFormMapper.updateProductDesignStatusByOrderId(tblOrderForm);
 		return tblOrderFormMapper.updateProductDesignStatusByOrderId(tblOrderForm);
 	}
 	}
 
 
+	@Override
+	public Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm) {
+		return tblOrderFormMapper.selectList(page,tblOrderForm);
+	}
+
 }
 }

@@ -42,12 +42,11 @@ public class ProductDesignController {
         String userNameByToken = JwtUtil.getUserNameByToken(req);
         String userNameByToken = JwtUtil.getUserNameByToken(req);
         List<String> roleList = sysUserService.getRole(userNameByToken);
         List<String> roleList = sysUserService.getRole(userNameByToken);
         SysUser sysUser = sysUserService.getUserByName(userNameByToken);
         SysUser sysUser = sysUserService.getUserByName(userNameByToken);
-        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
-//		 queryWrapper.isNotNull("designer");
-//        queryWrapper.in("design_role",roleList);
-        queryWrapper.eq("designer", sysUser.getWorkNo());
+        tblOrderForm.setDesigner(sysUser.getWorkNo());
+//        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
+//        queryWrapper.eq("designer", sysUser.getWorkNo());
         Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
         Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
-        IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
+        IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page, tblOrderForm);
         return Result.OK(pageList);
         return Result.OK(pageList);
     }
     }