更改导出表头标题

@@ -194,7 +194,7 @@ public class TblProductionGongxuController extends JeecgController<TblProduction
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblProductionGongxu tblProductionGongxu) {
     public ModelAndView exportXls(HttpServletRequest request, TblProductionGongxu tblProductionGongxu) {
-        return super.exportXls(request, tblProductionGongxu, TblProductionGongxu.class, "tbl_production_gongxu");
+        return super.exportXls(request, tblProductionGongxu, TblProductionGongxu.class, "工序");
     }
     }
 
 
     /**
     /**

@@ -118,7 +118,7 @@ public class TblProductionPlanController extends JeecgController<TblOrderForm, I
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblOrderForm tblProductionPlan) {
     public ModelAndView exportXls(HttpServletRequest request, TblOrderForm tblProductionPlan) {
-        return super.exportXls(request, tblProductionPlan, TblOrderForm.class, "tbl_production_plan");
+        return super.exportXls(request, tblProductionPlan, TblOrderForm.class, "生产计划");
     }
     }
 
 
     /**
     /**

@@ -115,6 +115,20 @@ public class TblSalaryBase implements Serializable {
 	@Excel(name = "全勤奖励", width = 15)
 	@Excel(name = "全勤奖励", width = 15)
     @ApiModelProperty(value = "全勤奖励")
     @ApiModelProperty(value = "全勤奖励")
     private BigDecimal fullAttendanceAward;
     private BigDecimal fullAttendanceAward;
+
+    /**合同周期开始时间*/
+    @Excel(name = "合同周期开始时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "合同周期开始时间")
+    private Date satrtTime;
+
+    /**合同周期结束时间*/
+    @Excel(name = "合同周期结束时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "合同周期结束时间")
+    private Date endTime;
 	/**劳动合同周期*/
 	/**劳动合同周期*/
 	@Excel(name = "劳动合同周期", width = 15, format = "yyyy-MM-dd")
 	@Excel(name = "劳动合同周期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

@@ -171,7 +171,7 @@ public class TblTradBaseController extends JeecgController<TblTradBase, TblTradB
      */
      */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradBase tblTradBase) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradBase tblTradBase) {
-        return super.exportXls(request, tblTradBase, TblTradBase.class, "tbl_trad_base");
+        return super.exportXls(request, tblTradBase, TblTradBase.class, "贸易基础信息");
     }
     }
 
 
     /**
     /**

@@ -193,7 +193,7 @@ public class TblTradContractController extends JeecgController<TblTradContract,
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradContract tblTradContract) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradContract tblTradContract) {
-        return super.exportXls(request, tblTradContract, TblTradContract.class, "tbl_trad_contract");
+        return super.exportXls(request, tblTradContract, TblTradContract.class, "贸易合同");
     }
     }
 
 
     /**
     /**

@@ -190,7 +190,7 @@ public class TblTradFphkController extends JeecgController<TblTradFphk, TblTradF
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradFphk tblTradFphk) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradFphk tblTradFphk) {
-        return super.exportXls(request, tblTradFphk, TblTradFphk.class, "tbl_trad_fphk");
+        return super.exportXls(request, tblTradFphk, TblTradFphk.class, "贸易发票回款");
     }
     }
 
 
     /**
     /**

@@ -160,7 +160,7 @@ public class TblTradInquiryController extends JeecgController<TblTradInquiry, Tb
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradInquiry tblTradInquiry) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradInquiry tblTradInquiry) {
-        return super.exportXls(request, tblTradInquiry, TblTradInquiry.class, "tbl_trad_inquiry");
+        return super.exportXls(request, tblTradInquiry, TblTradInquiry.class, "贸易询价");
     }
     }
 
 
     /**
     /**

@@ -163,7 +163,7 @@ public class TblTradReturnController extends JeecgController<TblTradReturn, ITbl
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradReturn tblTradReturn) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradReturn tblTradReturn) {
-        return super.exportXls(request, tblTradReturn, TblTradReturn.class, "tbl_trad_return");
+        return super.exportXls(request, tblTradReturn, TblTradReturn.class, "发票返回信息");
     }
     }
 
 
     /**
     /**

@@ -153,7 +153,7 @@ public class TblTradSupplierController extends JeecgController<TblTradSupplier,
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradSupplier tblTradSupplier) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradSupplier tblTradSupplier) {
-        return super.exportXls(request, tblTradSupplier, TblTradSupplier.class, "tbl_trad_supplier");
+        return super.exportXls(request, tblTradSupplier, TblTradSupplier.class, "供应商信息");
     }
     }
 
 
     /**
     /**

@@ -193,7 +193,7 @@ public class TblTradTenderController extends JeecgController<TblTradTender, TblT
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradTender tblTradTender) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradTender tblTradTender) {
-        return super.exportXls(request, tblTradTender, TblTradTender.class, "tbl_trad_tender");
+        return super.exportXls(request, tblTradTender, TblTradTender.class, "贸易中标采购信息");
     }
     }
 
 
     /**
     /**

@@ -190,7 +190,7 @@ public class TblTradTouController extends JeecgController<TblTradTou, TblTradTou
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TblTradTou tblTradTou) {
     public ModelAndView exportXls(HttpServletRequest request, TblTradTou tblTradTou) {
-        return super.exportXls(request, tblTradTou, TblTradTou.class, "tbl_trad_tou");
+        return super.exportXls(request, tblTradTou, TblTradTou.class, "贸易投标信息");
     }
     }
 
 
     /**
     /**

@@ -28,7 +28,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2024-04-15
  * @Date:   2024-04-15
  * @Version: V1.0
  * @Version: V1.0
  */
  */
-@Api(tags="tbl_trad_zong")
+@Api(tags="view_trad_zong")
 @RestController
 @RestController
 @RequestMapping("/trad/tblTradZong")
 @RequestMapping("/trad/tblTradZong")
 @Slf4j
 @Slf4j
@@ -46,7 +46,7 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @return
 	 * @return
 	 */
 	 */
 	//@AutoLog(value = "tbl_trad_zong-分页列表查询")
 	//@AutoLog(value = "tbl_trad_zong-分页列表查询")
-	@ApiOperation(value="tbl_trad_zong-分页列表查询", notes="tbl_trad_zong-分页列表查询")
+	@ApiOperation(value="view_trad_zong-分页列表查询", notes="view_trad_zong-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
 	@Transactional(rollbackFor = Exception.class)
 	@Transactional(rollbackFor = Exception.class)
 	public Result<IPage<ViewTradZong>> queryPageList(ViewTradZong viewTradZong,
 	public Result<IPage<ViewTradZong>> queryPageList(ViewTradZong viewTradZong,
@@ -65,8 +65,8 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @param viewTradZong
 	 * @param viewTradZong
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "tbl_trad_zong-添加")
-	@ApiOperation(value="tbl_trad_zong-添加", notes="tbl_trad_zong-添加")
+	@AutoLog(value = "view_trad_zong-添加")
+	@ApiOperation(value="view_trad_zong-添加", notes="view_trad_zong-添加")
 	@PostMapping(value = "/add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody ViewTradZong viewTradZong) {
 	public Result<String> add(@RequestBody ViewTradZong viewTradZong) {
 		viewTradZongService.save(viewTradZong);
 		viewTradZongService.save(viewTradZong);
@@ -79,8 +79,8 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @param viewTradZong
 	 * @param viewTradZong
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "tbl_trad_zong-编辑")
-	@ApiOperation(value="tbl_trad_zong-编辑", notes="tbl_trad_zong-编辑")
+	@AutoLog(value = "view_trad_zong-编辑")
+	@ApiOperation(value="view_trad_zong-编辑", notes="view_trad_zong-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody ViewTradZong viewTradZong) {
 	public Result<String> edit(@RequestBody ViewTradZong viewTradZong) {
 		viewTradZongService.updateById(viewTradZong);
 		viewTradZongService.updateById(viewTradZong);
@@ -93,8 +93,8 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "tbl_trad_zong-通过id删除")
-	@ApiOperation(value="tbl_trad_zong-通过id删除", notes="tbl_trad_zong-通过id删除")
+	@AutoLog(value = "view_trad_zong-通过id删除")
+	@ApiOperation(value="view_trad_zong-通过id删除", notes="view_trad_zong-通过id删除")
 	@DeleteMapping(value = "/delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		viewTradZongService.removeById(id);
 		viewTradZongService.removeById(id);
@@ -107,8 +107,8 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@AutoLog(value = "tbl_trad_zong-批量删除")
-	@ApiOperation(value="tbl_trad_zong-批量删除", notes="tbl_trad_zong-批量删除")
+	@AutoLog(value = "view_trad_zong-批量删除")
+	@ApiOperation(value="view_trad_zong-批量删除", notes="view_trad_zong-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.viewTradZongService.removeByIds(Arrays.asList(ids.split(",")));
 		this.viewTradZongService.removeByIds(Arrays.asList(ids.split(",")));
@@ -121,8 +121,8 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	//@AutoLog(value = "tbl_trad_zong-通过id查询")
-	@ApiOperation(value="tbl_trad_zong-通过id查询", notes="tbl_trad_zong-通过id查询")
+	//@AutoLog(value = "view_trad_zong-通过id查询")
+	@ApiOperation(value="view_trad_zong-通过id查询", notes="view_trad_zong-通过id查询")
 	@GetMapping(value = "/queryById")
 	@GetMapping(value = "/queryById")
 	public Result<ViewTradZong> queryById(@RequestParam(name="id",required=true) String id) {
 	public Result<ViewTradZong> queryById(@RequestParam(name="id",required=true) String id) {
 		ViewTradZong viewTradZong = viewTradZongService.getById(id);
 		ViewTradZong viewTradZong = viewTradZongService.getById(id);
@@ -140,7 +140,7 @@ public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTr
     */
     */
     @RequestMapping(value = "/exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, ViewTradZong viewTradZong) {
     public ModelAndView exportXls(HttpServletRequest request, ViewTradZong viewTradZong) {
-        return super.exportXls(request, viewTradZong, ViewTradZong.class, "tbl_trad_zong");
+        return super.exportXls(request, viewTradZong, ViewTradZong.class, "贸易综合信息");
     }
     }
 
 
 }
 }