Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/evaluate/dto/ResultViewingPageDto.java

@@ -20,4 +20,29 @@ public class ResultViewingPageDto extends PageInput {
      */
     @ApiModelProperty(value = "评价管理主键编号",required = true)
     private Long evaluateManageId;
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
+    /**
+     * 年级id
+     */
+    @ApiModelProperty("年级id")
+    private Long baseGradeId;
+    /**
+     * 班级id
+     */
+    @ApiModelProperty("班级id")
+    private Long classId;
+    /**
+     * 教师id
+     */
+    @ApiModelProperty("教师id")
+    private Long teacherId;
+    /**
+     * name
+     */
+    @ApiModelProperty("姓名")
+    private String name;
 }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -88,6 +88,9 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                 .leftJoin(XjrUser.class, XjrUser::getId, EvaluateObject::getObjectId)
                 .leftJoin(BaseClass.class, BaseClass::getId, EvaluateObject::getObjectId)
                 .eq(EvaluateObject::getEvaluateManageId, dto.getEvaluateManageId())
+                .eq((dto.getBaseGradeId() != null && dto.getBaseGradeId() > 0), BaseClass::getGradeId, dto.getBaseGradeId())
+                .eq((dto.getClassId() != null && dto.getClassId() > 0), BaseClass::getId, dto.getClassId())
+                .like((dto.getName() != null && !("").equals(dto.getName())), XjrUser::getName, dto.getName())
                 .disableSubLogicDel();
         IPage<ResultViewingPageVo> resultViewingPageVoIPage = evaluateObjectMapper.selectJoinPage(ConventPage.getPage(dto), ResultViewingPageVo.class, evaluateObjectMPJLambdaWrapper);
         //被评对象的id集合

src/main/java/com/xjrsoft/module/textbook/vo/TextbookIssueRecordPageVo.java

@@ -60,6 +60,13 @@ public class TextbookIssueRecordPageVo {
     @ExcelProperty("使用年级")
     @ApiModelProperty("使用年级")
     private String gradeName;
+    /**
+     * 使用年级
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学期")
+    @ApiModelProperty("学期")
+    public String baseSemesterIdCn;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("使用班级")

src/main/java/com/xjrsoft/module/textbook/vo/TextbookWarehouseRecordPageVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -39,7 +40,20 @@ public class TextbookWarehouseRecordPageVo {
     @ExcelProperty("书号")
     @ApiModelProperty("书号")
     private String issn;
-
+    /**
+     * 单价(元)
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("单价(元)")
+    @ApiModelProperty("单价(元)")
+    private BigDecimal Price;
+    /**
+     * 折扣
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("折扣")
+    @ApiModelProperty("折扣")
+    private Double discount;
     /**
     * 书名
     */
@@ -103,7 +117,13 @@ public class TextbookWarehouseRecordPageVo {
     @ExcelProperty("使用年级")
     @ApiModelProperty("使用年级")
     private String useGrade;
-
+    /**
+     * 使用年级
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学期")
+    @ApiModelProperty("学期")
+    public String baseSemesterIdCn;
     /**
      * 使用班级
      */

src/main/resources/mapper/textbook/TextbookIssueRecordMapper.xml

@@ -19,7 +19,8 @@
         t11.name AS issue_mode_cn,
         t1.create_date,
         t9.name  AS claim_user,
-        t1.issue_number
+        t1.issue_number,
+        t3.base_semester_id as baseSemesterIdCn
         FROM textbook_issue_record t1
         LEFT JOIN wf_textbook_claim_item t2 ON t1.data_item_id = t2.id
         LEFT JOIN wf_textbook_claim t4 ON t1.data_id = t4.id

src/main/resources/mapper/textbook/TextbookWarehouseRecordMapper.xml

@@ -6,6 +6,8 @@
     <select id="getPage" parameterType="com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto" resultType="com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo">
         SELECT t1.id,
         t1.sort_code,
+        t1.price,
+        t1.discount,
         t3.issn,
         t3.book_name,
         t3.publishing_house,
@@ -17,6 +19,7 @@
         t1.create_date,
         t2.name AS warehouse_user,
         t1.warehouse_number,
+        t3.base_semester_id as baseSemesterIdCn,
         (SELECT GROUP_CONCAT(c2.name)
         FROM textbook_class_relation c1
         LEFT JOIN base_class c2 ON c1.class_id = c2.id