接口开发

src/main/java/org/jeecg/modules/fbsPerson/controller/FbsPersonController.java

@@ -1,8 +1,7 @@
 package org.jeecg.modules.fbsPerson.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -19,6 +18,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -45,7 +46,55 @@ import com.alibaba.fastjson.JSON;
 public class FbsPersonController {
 	@Autowired
 	private IFbsPersonService fbsPersonService;
-	
+	 @Autowired
+	 private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
+
+
+	 /**
+	  * 仓库管理看板--仓库人员信息数据接口
+	  * @return
+	  */
+	 @RequestMapping(value = "/getWarehousePersonList")
+	 public List<FbsPerson> getWarehousePersonList(){
+		 List<FbsPerson> list = new ArrayList<>();
+		 SimpleDateFormat dateFm = new SimpleDateFormat("HH:mm");
+		 List<FbsWorkshopDispatchList> list1 = fbsWorkshopDispatchListService.selNowDispatchList();
+		 int i = 1;
+		 for (FbsWorkshopDispatchList o:list1){
+		 	i++;
+			 List<FbsPerson> personList = fbsPersonService.getPerByCode(o.getPersonnelIdU8());
+			 if(personList.size() > 0){
+			 	if(o.getFirstTime() == null){
+					o.setFirstTime(new Date());
+				}
+				 personList.get(0).setInTime(dateFm.format(o.getFirstTime()));
+				 personList.get(0).setRealName(o.getName());
+				 if(i%2 == 0){
+					 personList.get(0).setAvatar("/images/avatar/avata_2.jpg");
+				 }else{
+					 personList.get(0).setAvatar("/images/avatar/avata_5.jpg");
+				 }
+
+//				 personList.get(0).setInTime(o.getFirstTime());
+//				 personList.get(0).setInTime(o.getFirstTime());
+//				 personList.get(0).setInTime(o.getFirstTime());
+				 list.add(personList.get(0));
+			 }
+		 }
+
+		 return list;
+	 }
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	  * 分页列表查询
 	 * @param fbsPerson

src/main/java/org/jeecg/modules/fbsPerson/entity/FbsPerson.java

@@ -77,7 +77,18 @@ public class FbsPerson implements Serializable {
 //	private Date dpinvaliddate;
 
 
-	/**cdepname*/
-	@Excel(name = "cdepname", width = 15)
-	private String cdepname;
+	@TableField(exist = false)
+	private String inTime;//真实开工时间
+	@TableField(exist = false)
+	private String realName;
+	@TableField(exist = false)
+	private String warehouseId;
+	@TableField(exist = false)
+	private String warehouseName;
+	@TableField(exist = false)
+	private String classId;
+	@TableField(exist = false)
+	private String className;
+	@TableField(exist = false)
+	private String avatar;
 }

src/main/java/org/jeecg/modules/fbsPerson/mapper/FbsPersonMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 
 /**
  * @Description: 人员档案
@@ -21,4 +22,11 @@ public interface FbsPersonMapper extends BaseMapper<FbsPerson> {
     * @return java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>
     */
     List<FbsPerson> getPerAndDerp();
+
+    /**
+     * 通过人员编码查询
+     * @return
+     */
+    List<FbsPerson> getPerByCode(String code);
+
 }

src/main/java/org/jeecg/modules/fbsPerson/mapper/xml/FbsPersonMapper.xml

@@ -10,4 +10,26 @@
             LEFT JOIN Department d ON p.cDepCode= d.cDepCode
             ORDER by p.cPersonName
     </select>
+
+    <select id="getPerByCode" resultType="org.jeecg.modules.fbsPerson.entity.FbsPerson">
+        SELECT
+            p.*,
+            d.cDepName as warehouseName,d.cDepCode as warehouseId
+        FROM
+            Person p
+            LEFT JOIN Department d ON p.cDepCode= d.cDepCode
+             where cpersonCode=#{code}
+    </select>
+
+
+    <select id="selNowDispatchList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        SELECT
+            a.*,b.firstTime
+        FROM
+            fbs_workshop_dispatch_list a
+            left join fbs_working_statistics b on a.id = b.pk_workshop_dispatch_list and b.del_falg='0' and b.state='1'
+        WHERE
+            a.del_flag = '0' <!--and a.state ='1'-->
+
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsPerson/service/IFbsPersonService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.fbsPerson.service;
 
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 
 import java.util.List;
 
@@ -21,4 +22,10 @@ public interface IFbsPersonService extends IService<FbsPerson> {
     * @return java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>
     */
     List<FbsPerson> getPerAndDerp();
+    /**
+     * 通过人员编码查询
+     * @return
+     */
+    List<FbsPerson> getPerByCode(String code);
+
 }

src/main/java/org/jeecg/modules/fbsPerson/service/impl/FbsPersonServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import org.jeecg.modules.fbsPerson.mapper.FbsPersonMapper;
 import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,4 +29,9 @@ public class FbsPersonServiceImpl extends ServiceImpl<FbsPersonMapper, FbsPerson
     public List<FbsPerson> getPerAndDerp() {
         return fbsPersonMapper.getPerAndDerp();
     }
+    @Override
+    public List<FbsPerson> getPerByCode(String code) {
+        return fbsPersonMapper.getPerByCode(code);
+    }
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -173,4 +173,11 @@ public class FbsWorkshopDispatchList implements Serializable {
     //达成率
     @TableField(exist = false)
     private String achievementRate;
+
+	/**真实开工时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "MM-dd HH:mms")
+	@DateTimeFormat(pattern="MM-dd HH:mm")
+	@TableField(exist = false)
+	private Date firstTime;
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -16,7 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDispatchList> {
 
     int updateState(@Param("state")String state,@Param("id") String id);
-
+    /**
+     * 查询正在执行的派工单
+     * @return
+     */
+    List<FbsWorkshopDispatchList> selNowDispatchList();
     /**
     * @Author chenchuang
     * @Description //TODO 根据生产订单查询基本数据以及总的任务数量 总的标准工时

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -5,6 +5,17 @@
         update fbs_workshop_dispatch_list set state =#{state} where id = #{id}
     </update>
 
+    <select id="selNowDispatchList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        SELECT
+            a.*,b.first_time as firstTime
+        FROM
+            fbs_workshop_dispatch_list a
+            left join fbs_working_statistics b on a.id = b.pk_workshop_dispatch_list and b.del_flag='0' and b.state='1'
+        WHERE
+            a.del_flag = '0' <!--and a.state ='1'-->
+
+    </select>
+
     <select id="getDispatchListByDate" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
         SELECT
             *

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -14,7 +14,11 @@ import java.util.Map;
  */
 public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDispatchList> {
     int updateState(String state,String id);
-
+    /**
+     * 查询正在执行的派工单
+     * @return
+     */
+    List<FbsWorkshopDispatchList> selNowDispatchList();
     /**
     * @Author chenchuang
     * @Description //TODO 根据生产订单查询基本数据以及总的任务数量 总的标准工时

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -43,7 +43,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     public int updateState(String state,String id){
         return fbsWorkshopDispatchListMapper.updateState(state,id);
     }
-
+    @Override
+    public List<FbsWorkshopDispatchList> selNowDispatchList() {
+        return fbsWorkshopDispatchListMapper.selNowDispatchList();
+    }
     @Override
     public List<FbsWorkshopDispatchList> getSumDispatch() {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");