首次提交

src/main/java/com/xujie/sys/config/CorsConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-//@Configuration
+@Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
     @Override

src/main/java/com/xujie/sys/modules/pms/data/EamObjectSumReportData.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.type.Alias;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 @Alias("EamObjectSumReportData")
 public class EamObjectSumReportData extends QueryPage {
@@ -21,6 +22,7 @@ public class EamObjectSumReportData extends QueryPage {
     private Integer qtyUnFinishied;
     private Integer qtycancelled;
     private Double finishPercent;
+    private BigDecimal workTime;
     private String department;
     private String familyID;
     private String groupID;
@@ -194,4 +196,12 @@ public class EamObjectSumReportData extends QueryPage {
     public void setAdminLevelDesc(String adminLevelDesc) {
         this.adminLevelDesc = adminLevelDesc;
     }
+
+    public BigDecimal getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(BigDecimal workTime) {
+        this.workTime = workTime;
+    }
 }

src/main/java/com/xujie/sys/modules/sys/controller/SysLoginController.java

@@ -11,10 +11,7 @@ import com.xujie.sys.modules.sys.service.SysUserTokenService;
 import org.apache.commons.io.IOUtils;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;

src/main/resources/mapper/pms/EamReportMapper.xml

@@ -34,7 +34,7 @@
             <if test="query.endDate != null ">
                 AND #{query.endDate} >= a.PlanDate
             </if>
-        </where>shiftinfo
+        </where>
 
         ) a left join eam_family c on a.Site=c.Site and  a.FamilyID=c.FamilyID
         left join eam_group d on a.Site=d.Site and  a.GroupID=d.GroupID
@@ -45,10 +45,10 @@
  <select id="searchEamOperatorSumReport" resultType="EamObjectSumReportData">
         select    a.Site,a.Operator,a.OperatorName,a.department,a.adminLevelID,b.adminLevelDesc,sum(qtyAll) qtyAll
         ,sum(qtyFinished) qtyFinished,sum(qtyUnFinishied) qtyUnFinishied,sum(qtycancelled) qtycancelled
-        , Round(sum(qtyFinished) *100.0/sum(qtyAll),2) as finishPercent
+        , Round(sum(qtyFinished) *100.0/sum(qtyAll),2) as finishPercent,sum(workTime) workTime
         from (
         select  a.Site,a.ActualOperator Operator,dbo.eam_Get_eamAdminName(a.Site,a.ActualOperator) OperatorName,
-        b.department,b.LevelID adminLevelID
+        b.department,b.LevelID adminLevelID, isnull(a.workTime,0) workTime
         ,1 as qtyAll,case WHEN a.Status='已完工' then 1 else 0 end  as  qtyFinished, case WHEN a.Status='未开工' then 1 else 0 end  as  qtyUnFinishied, case WHEN a.Status='已取消' then 1 else 0 end  as  qtycancelled
         from  eam_workOrder a left join  eam_admin b on a.Site=b.Site and a.ActualOperator =b.AdminID
          <where>