moral.git - Gitblit

			@@ -6,40 +6,42 @@
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.apache.commons.collections4.CollectionUtils;
			import org.aspectj.apache.bcel.generic.RET;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.moral.api.entity.AllocationLog;
			import com.moral.api.pojo.enums.SysDictTypeEnum;
			import com.moral.api.pojo.ext.allocation.AllocationExt;
			import com.moral.api.pojo.ext.allocation.AllocationPageExt;
			import com.moral.api.pojo.query.allocation.*;
			import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
			import com.moral.api.pojo.vo.allocation.AllocationFindVo;

			import com.moral.api.pojo.vo.allocation.AllocationPageVo;
			import com.moral.api.pojo.vo.allocation.AllocationVo;
			import com.moral.api.utils.BeanConverts;

			import com.moral.constant.PageResult;
			import io.swagger.annotations.*;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.util.ObjectUtils;

			import org.springframework.web.bind.annotation.*;

			import java.lang.reflect.Field;
			import java.util.ArrayList;
			import java.util.HashMap;

			import java.util.List;
			import java.util.Map;

			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;

			import com.moral.api.entity.Allocation;
			import com.moral.api.entity.ResponsibilityUnit;
			import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;

			import com.moral.api.service.AllocationService;
			import com.moral.api.utils.EasyExcelUtils;
			import com.moral.api.utils.NoModelWriteData;
			import com.moral.constant.Constants;
			import com.moral.constant.ResultMessage;
			import com.moral.util.DateUtils;
			import com.moral.util.WebUtils;


			import javax.validation.Valid;

			@@ -134,6 +136,7 @@
			allocationVo.setFileChangeList(allocationext.getFileChangeList());
			allocationVo.setFileApproveList(allocationext.getFileApproveList());
			allocationVo.setApproveList(allocationext.getApproveList());
			allocationVo.setTime(DateUtils.dateToDateString(allocationVo.getEscalationTime(), DateUtils.yyyy_MM_dd_CN));
			return ResultMessage.ok(allocationVo);
			}
			@GetMapping("remove")
			@@ -198,31 +201,22 @@
			}
			}



			@GetMapping("selectSmallRoutine")
			@ApiOperation("小程序查询")
			public ResultMessage selectSmallRoutine(@RequestParam @ApiParam(value = "state",name = "状态") Integer state,
			@RequestParam @ApiParam(value = "startTime",name = "开始时间") String startTime,
			@RequestParam @ApiParam(value = "endTime",name = "结束时间") String endTime){
			List<AllocationFindVo> allocationFindVos = allocationService.selectSmallRoutine(state,startTime,endTime);
			return ResultMessage.ok(ObjectUtils.isEmpty(allocationFindVos)? "0":allocationFindVos);
			}


			@PostMapping("changeRoutine")
			@ApiOperation("小程序整改")
			public ResultMessage changeSmallRoutine(@Valid @RequestBody AllocationChangeCond changeCond){
			allocationService.changeSmallRoutine(changeCond);
			@GetMapping("updataUnit")
			@ApiOperation("修改责任单位")
			public ResultMessage updataUnit(@RequestParam @ApiParam(value = "id",name = "主键id") Integer id,
			@RequestParam @ApiParam(value = "unitId",name = "责任主题Id") Integer unitId,
			@RequestParam @ApiParam(value = "polluteType",name = "污染分类Id") Integer polluteType){
			allocationService.updataUnit(id,unitId,polluteType);
			return ResultMessage.ok();
			}


			@PostMapping("checkRoutine")
			@ApiOperation("小程序审批")
			public ResultMessage checkSmallRoutine(@Valid @RequestBody AllocationCheckCond checkCond){
			allocationService.checkSmallRoutine(checkCond);
			return ResultMessage.ok();

			@GetMapping("getLog")
			@ApiOperation("修改记录")
			public ResultMessage getLog(@RequestParam @ApiParam(value = "allocationNum",name = "责任单号") String allocationNum){
			List<AllocationLog> log = allocationService.getLog(allocationNum);
			return ResultMessage.ok(log);
			}