tpy 2022-11-23

src/main/java/com/steerinfo/ems/tmaintenance/controller/TMaintenanceController.java

@@ -4,6 +4,7 @@ import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.tmaintenancefile.model.TMaintenanceFile;
 import com.steerinfo.ems.tmaintenancefile.service.ITMaintenanceFileService;
+import com.steerinfo.ems.tsubmitted.model.TSubmitted;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -47,20 +48,21 @@ import java.util.stream.Collectors;
 public class TMaintenanceController extends BaseRESTfulController {
     /** 文件保存路径  */
     public static final String FILE_DIR = "/static/";
-
+	
     @Autowired
     ITMaintenanceService tMaintenanceService;
     @Autowired
     private FtpFileUtil ftpFileUtil;
     @Autowired
     ITMaintenanceFileService tMaintenanceFileService;
-
+	
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
         @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
     })
     @GetMapping(value = "/")
+	//@RequiresPermissions("tmaintenance:view")
     public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
         PageList<TMaintenance> list = tMaintenanceService.queryForPage(parmas, pageNum, pageSize);
         return success(list);

src/main/java/com/steerinfo/ems/tmaintenance/mapper/TMaintenanceMapper.xml

@@ -243,7 +243,7 @@
         or RECORDER = #{recorder}
       </if>
   </delete>
-  <insert id="insert" parameterType="com.steerinfo.ems.temergencymaterials.model.TEmergencymaterials">
+  <insert id="insert" parameterType="com.steerinfo.ems.tmaintenance.model.TMaintenance">
     insert into T_MAINTENANCE (DECLAREID, BILLSTATUS, EQUIPMENTNAME, 
       CHARGEMAN, APPLAYER, REASONCONTENT, 
       BZ, SIGNTIME, APPROVER,