报表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/controller/ProductionScheduleController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
+import java.util.List;
 
 import static org.jeecg.common.config.mqtoken.UserTokenContext.getToken;
 
@@ -51,6 +52,14 @@ public class ProductionScheduleController {
         return result;
     }
 
+    @AutoLog(value = "生产进度报表-查看图片")
+    @ApiOperation(value="生产进度报表-查看图片", notes="生产进度报表-查看图片,根据图片id查询图片流")
+    @GetMapping(value = "/selectPicture")
+    public List<ProductionSchedule> selectPicture(String pictureId){
+        List<ProductionSchedule> list = productionScheduleService.selectPicture(pictureId);
+        return list;
+    }
+
     public static void main(String[] args) {
         System.out.println(getToken());
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/entity/ProductionSchedule.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.productionScheduleReport.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -7,24 +8,44 @@ import lombok.Data;
  */
 @Data
 public class ProductionSchedule {
-
+    @ApiModelProperty(value = "部门")
     private String cDepName;// ;// 部门
+    @ApiModelProperty(value = "业务员")
     private String cPersonName;// ;// 业务员
+    @ApiModelProperty(value = "销售订单号")
     private String cSOCode;// ;// 销售订单号
+    @ApiModelProperty(value = "客户")
     private String cCusName ;// 客户
+    @ApiModelProperty(value = "存货编码")
     private String cInvCode ;// 存货编码
+    @ApiModelProperty(value = "存货名称")
     private String cInvName ;// 存货名称
+    @ApiModelProperty(value = "款号")
     private String itemNumber ;// 款号
+    @ApiModelProperty(value = "颜色")
     private String color;// 颜色
+    @ApiModelProperty(value = "交期")
     private String dPreDateBT ;// 交期
+    @ApiModelProperty(value = "订单数量")
     private String iQuantity ;//订单数量
+    @ApiModelProperty(value = "原币含税单价")
     private String iTaxUnitPrice ;// 原币含税单价
+    @ApiModelProperty(value = "总额（原币）")
     private String totalSum ;// 总额（原币）
+    @ApiModelProperty(value = "单价（本币）")
     private String bbPrice ;// 单价（本币）
+    @ApiModelProperty(value = "总额（本币）")
     private String iNatSum ;// 总额（本币）
+    @ApiModelProperty(value = "实际发票成本")
     private String icostsum ;// 实际发票成本
+    @ApiModelProperty(value = "已出库数量")
     private String foutquantity ;//已出库数量
+    @ApiModelProperty(value = "累计开票数量")
     private String iKPQuantity ;//累计开票数量
+    @ApiModelProperty(value = "累计开票金额")
     private String iKPMoney ;// 累计开票金额
-
+    @ApiModelProperty(value = "图片id")
+    private String pictureId;//图片id
+    @ApiModelProperty(value = "图片流")
+    private byte[] picture;//图片流
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/ProductionScheduleMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
 
+import java.util.List;
+
 
 /**
  * @Description: 生产进度报表
@@ -16,4 +18,5 @@ public interface ProductionScheduleMapper extends BaseMapper<ProductionSchedule>
 
     IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page, @Param("ew") QueryWrapper<ProductionSchedule> queryWrapper);
 
+    List<ProductionSchedule> selectPicture(String pictureId);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/xml/ProductionScheduleMapper.xml

@@ -22,8 +22,8 @@
              ,b.icostsum -- 实际发票成本
              ,b.foutquantity --已出库数量
              ,b.iKPQuantity --累计开票数量
-             ,b.iKPMoney -- 累计开票金额
-
+             ,b.iKPMoney, -- 累计开票金额
+             ,f.pictureGUid pictureId
         from SO_SOMain a
                  left join SO_SODetails b on a.id = b.id
                  left join Department c on c.cDepCode = a.cDepCode
@@ -34,4 +34,8 @@
         and len(cInvCCode) = 6
 
     </select>
+    
+    <select id="selectPicture" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
+        select picture,cPicturetype from aa_picture where cGUid = #{pictureId}
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/ProductionScheduleService.java

@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
 
+import java.util.List;
+
 
 public interface ProductionScheduleService extends IService<ProductionSchedule> {
     @DS("multi-three")
     public IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page, QueryWrapper<ProductionSchedule> queryWrapper);
-
+    @DS("multi-three")
+    public List<ProductionSchedule> selectPicture(String pictureId);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/impl/ProductionScheduleImpl.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.productionScheduleReport.service.ProductionScheduleServ
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class ProductionScheduleImpl extends ServiceImpl<ProductionScheduleMapper, ProductionSchedule> implements ProductionScheduleService {
@@ -23,4 +24,9 @@ public class ProductionScheduleImpl extends ServiceImpl<ProductionScheduleMapper
         return productionScheduleMapper.selectByPage(page, queryWrapper);
     }
 
+    @Override
+    @DS("multi-three")
+    public List<ProductionSchedule> selectPicture(String pictureId){
+        return productionScheduleMapper.selectPicture(pictureId);
+    }
 }