فهرست منبع

物品申购台账

dzx 1 سال پیش
والد
کامیت
dd6f1a50cb

+ 1 - 1
src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java

@@ -73,7 +73,7 @@ public class WfSubscriptionController {
     public RT<Boolean> add(@Valid @RequestBody AddWfSubscriptionDto dto){
         WfSubscription wfSubscription = BeanUtil.toBean(dto, WfSubscription.class);
         boolean isSuccess = wfSubscriptionService.add(wfSubscription);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
 

+ 2 - 1
src/main/java/com/xjrsoft/module/ledger/mapper/WfSubscriptionMapper.java

@@ -8,6 +8,7 @@ import com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionListInfoVo;
 import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -38,5 +39,5 @@ public interface WfSubscriptionMapper extends MPJBaseMapper<WfSubscription> {
     /**
      * 列表查询
      */
-    List<WfSubscriptionExcelVo> getList(WfSubscriptionPageDto dto);
+    List<WfSubscriptionExcelVo> getList(@Param("dto") WfSubscriptionPageDto dto);
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/ledger/vo/WfSubscriptionExcelVo.java

@@ -38,7 +38,7 @@ public class WfSubscriptionExcelVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("申请日期")
     @ApiModelProperty("申请日期")
-    private Date shenQingRiQi4752;
+    private String shenQingRiQi4752;
     /**
     * 申请人
     */

+ 1 - 1
src/main/resources/mapper/ledger/WfSubscriptionMapper.xml

@@ -21,7 +21,7 @@
     </select>
 
     <select id="getList" parameterType="com.xjrsoft.module.ledger.dto.WfSubscriptionPageDto" resultType="com.xjrsoft.module.ledger.vo.WfSubscriptionExcelVo">
-        select t1.id,t2.name as org_name,t3.name as user_name,t1.shen_qing_ri_qi4752,t1.folder_id,t1.number from wf_subscription t1
+        select t1.id,t2.name as org_name,t3.name as user_name,DATE_FORMAT(t1.shen_qing_ri_qi4752, '%Y年%m月%d日') as shen_qing_ri_qi4752, t1.folder_id,t1.number from wf_subscription t1
         left join xjr_department t2 on t1.application_department = t2.id
         left join xjr_user t3 on t1.user_id = t3.id
         where 1 = 1