kangwei:重点事项推进情况 联调

       bug修改

@@ -18,9 +18,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.common.vo.TreeNodeVO;
 import com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls;
+import com.skua.tool.util.DateUtils;
 import com.skua.tool.util.TreeBuilder;
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -276,11 +278,21 @@ public class AjhPlanScheduleConfigController {
 		// Step.1 组装查询条件
 		//Step.2 AutoPoi 导出Excel
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-		List<AjhPlanScheduleConfigXls> pageList = new ArrayList<>();
+
+		// Step.1 组装查询条件
+		String departId = "1711662624459804674";
+		String years = DateUtils.getCurrentYear()+"";
+		if(StringUtils.isNotEmpty(request.getParameter("departId"))){
+			departId = request.getParameter("departId");
+		}
+		if(StringUtils.isNotEmpty(request.getParameter("years"))){
+			years = request.getParameter("years");
+		}
+		List<AjhPlanScheduleConfigXls> pageList = ajhPlanScheduleConfigService.exportXlsTemplate(departId,years);
 		//导出文件名称
 		mv.addObject(NormalExcelConstants.FILE_NAME, "经营方案计划表列表");
 		mv.addObject(NormalExcelConstants.CLASS, AjhPlanScheduleConfigXls.class);
-		mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("经营方案计划表列表数据", "", ""));
+		mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("经营方案计划表列表数据", "导出人：", "经营方案计划表"));
 		mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
 		return mv;
 	}
@@ -298,8 +310,8 @@ public class AjhPlanScheduleConfigController {
 	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-		String factoryId = request.getParameter("departId");
-		String year = request.getParameter("year");
+		String departId = request.getParameter("departId");
+		String years = request.getParameter("years");
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			MultipartFile file = entity.getValue();// 获取上传文件对象
 			ImportParams params = new ImportParams();
@@ -308,7 +320,7 @@ public class AjhPlanScheduleConfigController {
 			params.setNeedSave(true);
 			try {
 				List<AjhPlanScheduleConfigXls> listAjhPlanScheduleConfigs = ExcelImportUtil.importExcel(file.getInputStream(), AjhPlanScheduleConfigXls.class, params);
-				ajhPlanScheduleConfigService.importExcel(listAjhPlanScheduleConfigs,factoryId,year);
+				ajhPlanScheduleConfigService.importExcel(listAjhPlanScheduleConfigs,departId,years);
 				return Result.ok("文件导入成功！数据行数:" + listAjhPlanScheduleConfigs.size());
 			} catch (Exception e) {
 				log.error(e.getMessage(),e);

@@ -2,6 +2,7 @@ package com.skua.modules.ajh.mapper;
 
 import java.util.List;
 
+import com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls;
 import org.apache.ibatis.annotations.Param;
 import com.skua.modules.ajh.entity.AjhPlanScheduleConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AjhPlanScheduleConfigMapper extends BaseMapper<AjhPlanScheduleConfig> {
 
+    List<AjhPlanScheduleConfigXls> exportXlsTemplate(@Param("departId") String departId, @Param("years")String years);
 }

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.ajh.mapper.AjhPlanScheduleConfigMapper">
 
-</mapper>
\ No newline at end of file
+
+    <select id="exportXlsTemplate" resultType="com.skua.modules.ajh.vo.AjhPlanScheduleConfigXls">
+      select p.config_name 'workName', t.config_name,t.complete_time,t.responsibler from ajh_plan_schedule_config  t
+        left join ajh_plan_schedule_config p on t.parent_id  = p.id
+        where t.parent_id > 0 and t.depart_id = #{departId} and  t.years =#{years}
+        order by t.parent_id asc ,t.create_time asc
+    </select>
+</mapper>

@@ -23,5 +23,7 @@ public interface IAjhPlanScheduleConfigService extends IService<AjhPlanScheduleC
      * 导入excel文件
      * @param listAjhPlanScheduleConfigs
      */
-    void importExcel(List<AjhPlanScheduleConfigXls> listAjhPlanScheduleConfigs,String factoryId,String years);
+    void importExcel(List<AjhPlanScheduleConfigXls> listAjhPlanScheduleConfigs,String departId,String years);
+
+    List<AjhPlanScheduleConfigXls> exportXlsTemplate(String departId, String years);
 }

@@ -54,7 +54,7 @@ public class AjhPlanScheduleConfigServiceImpl extends ServiceImpl<AjhPlanSchedul
      * @param listAjhPlanScheduleConfigs
      */
     @Transactional
-    public void importExcel(List<AjhPlanScheduleConfigXls> listAjhPlanScheduleConfigs,String factoryId,String year){
+    public void importExcel(List<AjhPlanScheduleConfigXls> listAjhPlanScheduleConfigs,String departId,String year){
         Map<String,List<AjhPlanScheduleConfigXls>> dataMap = new HashMap<>();
         List<AjhPlanScheduleConfigXls> confiList = null;
         for(AjhPlanScheduleConfigXls  scheduleConfigXls  :listAjhPlanScheduleConfigs){
@@ -73,14 +73,23 @@ public class AjhPlanScheduleConfigServiceImpl extends ServiceImpl<AjhPlanSchedul
             //System.out.println("key = " + entry.getKey() + ", value = " + entry.getValue());
             //新增父类
             //String configId = UniqIdUtils.getInstance().getUniqID();
-            planScheduleConfig = new AjhPlanScheduleConfig( factoryId ,year,entry.getKey());
+            planScheduleConfig = new AjhPlanScheduleConfig( departId ,year,entry.getKey());
             this.baseMapper.insert(planScheduleConfig);
             //新增子类
             for( AjhPlanScheduleConfigXls  planScheduleConfigXls : entry.getValue()){
-                this.baseMapper.insert(new AjhPlanScheduleConfig( factoryId,year ,planScheduleConfig.getParentId(),planScheduleConfig.getConfigName(),planScheduleConfig.getCompleteTime(),planScheduleConfig.getResponsibler()));
+                this.baseMapper.insert(new AjhPlanScheduleConfig( departId,year ,planScheduleConfig.getId(),planScheduleConfigXls.getConfigName(),planScheduleConfigXls.getCompleteTime(),planScheduleConfigXls.getResponsibler()));
             }
         }
     }
 
-
+    public List<AjhPlanScheduleConfigXls> exportXlsTemplate(String departId, String years){
+        List<AjhPlanScheduleConfigXls>  dataList =  this.baseMapper.exportXlsTemplate(departId, years);
+        int index  = 1 ;
+        if(dataList != null && !dataList.isEmpty()){
+            for( AjhPlanScheduleConfigXls  planScheduleConfigXls :  dataList ){
+                planScheduleConfigXls.setIndex(index++);
+            }
+        }
+        return dataList;
+    }
 }

@@ -10,9 +10,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 @Data
 public class AjhPlanScheduleConfigXls {
-    @Excel(name = "序号", width = 15)
+    @Excel(name = "序号", width = 5)
     @ApiModelProperty(value = "序号")
-    private String index;
+    private Integer index;
     @Excel(name = "工作事项", width = 15)
     @ApiModelProperty(value = "工作事项")
     private String workName;

@@ -7,6 +7,7 @@ import com.skua.modules.emergency.service.IEmergencyRiskEventService;
 import com.skua.modules.emergency.vo.DangerDatabaseResult;
 import com.skua.modules.emergency.vo.MapDatabaseResult;
 import com.skua.modules.emergency.vo.RiskDatabaseResult;
+import com.skua.tool.util.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -40,6 +41,10 @@ public class EventMapController {
 		return result;
 	}
 
+
+
+
+
 	/**
 	 * 	风险库统计
 	 */
@@ -60,12 +65,14 @@ public class EventMapController {
 	@AutoLog(value = "隐患排查巡检统计")
 	@ApiOperation(value="隐患排查巡检统计", notes="隐患排查巡检统计")
 	@GetMapping(value = "/getDangerList")
-	public Result<List<DangerDatabaseResult>> getDangerList( String departIds,String year){
+	public Result<List<DangerDatabaseResult>> getDangerList( String departIds,String startDate,String endDate){
 		Result<List<DangerDatabaseResult>> result = new Result<>();
 		if(StringUtils.isEmpty(departIds)){
 			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
 		}
-		List<DangerDatabaseResult> list = emergencyRiskEventService.getDangerList(departIds,year);
+		if(StringUtils.isEmpty(startDate)) startDate = DateUtils.getCurrentYear()+"-01-01";
+		if(StringUtils.isEmpty(endDate)) endDate = DateUtils.getCurrentYear()+"-12-31";
+		List<DangerDatabaseResult> list = emergencyRiskEventService.getDangerList(departIds,startDate,endDate);
 		result.setSuccess(true);
 		result.setResult(list);
 		return result;
@@ -77,15 +84,16 @@ public class EventMapController {
 	@AutoLog(value = "地图隐患排查巡检统计")
 	@ApiOperation(value="地图隐患排查巡检统计", notes="地图隐患排查巡检统计")
 	@GetMapping(value = "/getMapData")
-	public Result<List<MapDatabaseResult>> getMapData(String departIds,String year){
+	public Result<List<MapDatabaseResult>> getMapData(String departIds,String startDate,String endDate){
 		Result<List<MapDatabaseResult>> result = new Result<>();
 		if(StringUtils.isEmpty(departIds)){
 			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
 		}
-		List<MapDatabaseResult> list = emergencyRiskEventService.getMapData(departIds,year);
+		if(StringUtils.isEmpty(startDate)) startDate = DateUtils.getCurrentYear()+"-01-01";
+		if(StringUtils.isEmpty(endDate)) endDate = DateUtils.getCurrentYear()+"-12-31";
+		List<MapDatabaseResult> list = emergencyRiskEventService.getMapData(departIds,startDate,endDate);
 		result.setSuccess(true);
 		result.setResult(list);
 		return result;
 	}
-
 }

@@ -19,8 +19,8 @@ public interface EmergencyRiskEventMapper extends BaseMapper<EmergencyRiskEvent>
     List<RiskDatabaseResult> getRiskList(@Param("year") String year);
 
     @Anonymous
-    List<DangerDatabaseResult> getDangerList( @Param("departIds")String departIds , @Param("year") String year);
+    List<DangerDatabaseResult> getDangerList( @Param("departIds")String departIds , @Param("startDate") String startDate,@Param("endDate")String endDate);
 
     @Anonymous
-    List<MapDatabaseResult> getMapData( @Param("departIds")String departIds , @Param("year") String year);
+    List<MapDatabaseResult> getMapData( @Param("departIds")String departIds );
 }

@@ -37,7 +37,13 @@
             LEFT JOIN sys_user u ON u.id = r.report_user
         WHERE
             d.depart_type = 1
-            AND r.report_date LIKE CONCAT(#{year},'%')
+
+            <if test="startDate != null  and  startDate != ''">
+                and  DATE_FORMAT( r.report_date, '%Y-%m-%d' )  &gt;= #{startDate}
+            </if>
+            <if test="endDate != null  and endDate != ''">
+                and  DATE_FORMAT( r.report_date, '%Y-%m-%d' )  &lt;= #{endDate}
+            </if>
             <if test="departIds != null and departIds !='' ">
                 and d.id in (${departIds})
             </if>

@@ -45,12 +45,11 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
      * 隐患排查巡检统计
      * @return
      */
-    List<DangerDatabaseResult> getDangerList(String departIds, String year);
+    List<DangerDatabaseResult> getDangerList(String departIds, String startDate,String endDate);
 
     /**
      * 地图隐患排查数量
-     * @param year
      * @return
      */
-    List<MapDatabaseResult> getMapData(String departIds,  String year);
+    List<MapDatabaseResult> getMapData(String departIds,  String startDate,String endDate);
 }

@@ -161,21 +161,21 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
     }
 
     @Override
-    public List<DangerDatabaseResult> getDangerList(String departIds, String year) {
-        if(StringUtils.isEmpty(year)){
+    public List<DangerDatabaseResult> getDangerList(String departIds, String startDate,String endDate) {
+       /* if(StringUtils.isEmpty(year)){
             year = String.valueOf(DateUtils.getYear());
-        }
-        List<DangerDatabaseResult> list = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach( departIds, ","),  year);
+        }*/
+        List<DangerDatabaseResult> list = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach( departIds, ","),  startDate, endDate);
         return list;
     }
 
     @Override
-    public List<MapDatabaseResult> getMapData(String departIds,String year) {
-        if(StringUtils.isEmpty(year)){
+    public List<MapDatabaseResult> getMapData(String departIds,String startDate,String endDate) {
+      /*  if(StringUtils.isEmpty(year)){
             year = String.valueOf(DateUtils.getYear());
-        }
-        List<DangerDatabaseResult> dangerList = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach(departIds,","),  year);
-        List<MapDatabaseResult> list = emergencyRiskEventMapper.getMapData(JSUtils.quoteEach(departIds,","),year);
+        }*/
+        List<DangerDatabaseResult> dangerList = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach(departIds,","),  startDate, endDate);
+        List<MapDatabaseResult> list = emergencyRiskEventMapper.getMapData(JSUtils.quoteEach(departIds,","));
         for (MapDatabaseResult mapDatabaseResult : list) {
             List<DangerDatabaseResult> daList = new ArrayList<>();
             String departId = mapDatabaseResult.getDepartId();

@@ -191,6 +191,10 @@ public class MaterialINController {
 		if(StringUtils.isNotEmpty(req.getParameter("arriveTime_end"))){
 			materialINVO.setEndTime( req.getParameter("arriveTime_end") );
 		}
+		if(StringUtils.isEmpty(materialINVO.getDepartId())){
+			materialINVO.setDepartIds( JSUtils.quoteEach( BaseContextHandler.getDeparts(),","));
+		}
+
 		materialINVO.setAuditStatus("3");
 		IPage<MaterialINVO> pageList = materialINService.arrivalRecordList(page, materialINVO);
         result.setSuccess(true);

@@ -30,7 +30,7 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
      * @return
      */
     List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
-
+    @Anonymous
     List<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, @Param("param")MaterialINVO materialINVO);
     @Anonymous
     MaterialINVO queryById(@Param("id") String id);

@@ -89,6 +89,10 @@
         left join ajh_supplier_manage sm on sm.id = t.supplier_id
         left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code)
          where t.audit_status = #{param.auditStatus}
+
+        <if test="param.departIds != null and param.departIds != ''">
+            and t.depart_id  in(${param.departIds})
+        </if>
         <if test="param.departId != null and param.departId != ''">
             and t.depart_id  = #{param.departId}
         </if>

@@ -22,6 +22,9 @@ public class MaterialINVO   extends MaterialIN {
     /**税额*/
     @ApiModelProperty(value = "税额")
     private String taxAmount;
+
+    @ApiModelProperty(value = "权限厂站编号集合")
+    private String departIds;
     /**药剂(物料)名称*/
     @Excel(name = "药剂(物料)名称", width = 15)
     @ApiModelProperty(value = "药剂(物料)名称")

@@ -2,44 +2,23 @@ package com.skua.modules.report.controller;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
-import com.skua.core.context.BaseContextHandler;
 import com.skua.core.query.QueryGenerator;
-import com.skua.core.service.ISequenceService;
-import com.skua.core.util.ConvertUtils;
 import com.skua.modules.report.entity.MajorIssuesProcess;
 import com.skua.modules.report.entity.MajorIssuesProcessItem;
 import com.skua.modules.report.service.IMajorIssuesProcessItemService;
 import com.skua.modules.report.service.IMajorIssuesProcessService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.skua.modules.system.entity.SysConfig;
 import com.skua.modules.system.service.ISysConfigService;
 import com.skua.modules.system.service.SmsService;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -74,6 +53,8 @@ public class MajorIssuesProcessController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<MajorIssuesProcess>> result = new Result<IPage<MajorIssuesProcess>>();
+		//majorIssuesProcess.setFrequency(null);//不参与查询
+		//majorIssuesProcess.setContrastFlag(null);//不参与查询
 		QueryWrapper<MajorIssuesProcess> queryWrapper = QueryGenerator.initQueryWrapper(majorIssuesProcess, req.getParameterMap());
 		Page<MajorIssuesProcess> page = new Page<MajorIssuesProcess>(pageNo, pageSize);
 		IPage<MajorIssuesProcess> pageList = majorIssuesProcessService.page(page, queryWrapper);
@@ -157,25 +138,53 @@ public class MajorIssuesProcessController {
 		return result;
 	}
 
-	@AutoLog(value = "重点事项推进情况-信息推送")
-	@ApiOperation(value="重点事项推进情况-信息推送", notes="重点事项推进情况-信息推送")
-	@GetMapping(value = "/pushMessage")
-	public Result<MajorIssuesProcess> pushMessage(@RequestParam(name="id",required=true) String id) {
+
+	@AutoLog(value = "重点事项推进情况-结束")
+	@ApiOperation(value="重点事项推进情况-结束", notes="重点事项推进情况-结束")
+	@GetMapping(value = "/endProcess")
+	public Result<MajorIssuesProcess> endProcess(@RequestParam(name="id",required=true) String id ,@RequestParam("status") String status) {
 		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
 		MajorIssuesProcess majorIssuesProcess = majorIssuesProcessService.getById(id);
 		if(majorIssuesProcess==null) {
 			result.error500("未找到对应实体");
 		}else {
-			//
-			String roleId = sysConfigService.queryValueByKey("YXBG_ROLE_ID");
-			if(StringUtils.isNotEmpty(roleId)){
-				smsService.pushMsgNoProcessByRoleId("请查看重点事项推进进展" ,"请查看:["+majorIssuesProcess.getMatterName()+"]重点事项推进进展"  ,roleId,"MajorIssuesProcess");
-				result.setResult(majorIssuesProcess);
-				result.setSuccess(true);
+			if(StringUtils.isNotEmpty(status)){
+				majorIssuesProcess.setStatus(status);
+			}else{
+				majorIssuesProcess.setStatus("3");
+			}
+
+
+			result.setResult(majorIssuesProcess);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+	@AutoLog(value = "重点事项推进情况-信息推送")
+	@ApiOperation(value="重点事项推进情况-信息推送", notes="重点事项推进情况-信息推送")
+	@GetMapping(value = "/pushMessage")
+	public Result<MajorIssuesProcess> pushMessage(String id) {
+		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
+		String message = "请及时查看重点事项推进进展！";
+		MajorIssuesProcess majorIssuesProcess = null;
+		if(StringUtils.isNotEmpty(id)){
+			majorIssuesProcess = majorIssuesProcessService.getById(id);
+
+			if(majorIssuesProcess==null) {
+				result.error500("未找到对应实体");
 			}else{
-				result.error500("未找到信息推送的角色");
+				message = "请查看:["+majorIssuesProcess.getMatterName()+"]重点事项推进进展";
 			}
 		}
+
+		String roleId = sysConfigService.queryValueByKey("YXBG_ROLE_ID");
+		if(StringUtils.isNotEmpty(roleId)){
+			smsService.pushMsgNoProcessByRoleId("请及时查看重点事项推进进展" ,message  ,roleId,"MajorIssuesProcess");
+			result.setResult(majorIssuesProcess);
+			result.setSuccess(true);
+		}else{
+			result.error500("未找到信息推送的角色");
+		}
 		return result;
 	}
 

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.core.aspect.annotation.Dict;
+import com.skua.core.aspect.annotation.NoQuery;
 import com.skua.tool.util.DateUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,7 @@ public class MajorIssuesProcess {
 	/**水务公司*/
 	@Excel(name = "水务公司", width = 15)
     @ApiModelProperty(value = "水务公司")
+	@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
 	private String departId;
 	/**事项名称*/
 	@Excel(name = "事项名称", width = 15)
@@ -55,8 +57,6 @@ public class MajorIssuesProcess {
 	@Dict(dicCode = "loop_unit")
 	private String cycleUnit;
 
-
-
 	/**预估金额*/
 	@Excel(name = "预估金额", width = 15)
     @ApiModelProperty(value = "预估金额")
@@ -74,6 +74,11 @@ public class MajorIssuesProcess {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date currentProgressTime;
+
+	@Excel(name="状态",width=15)
+	@ApiModelProperty(value = "状态： 未开始 0 ;   进行中 1 ; 已结束 2")
+	@Dict(dicCode = "meetting_status")
+	private String status;
 	/**创建人id*/
 	@Excel(name = "创建人id", width = 15)
     @ApiModelProperty(value = "创建人id")
@@ -99,11 +104,13 @@ public class MajorIssuesProcess {
     @ApiModelProperty(value = "删除标识，0:正常,1:删除")
 	private Integer delFlag;
 
+/*	@NoQuery
 	@TableField(exist=false)
 	@Excel(name = "推进频率小时", width = 15)
 	@ApiModelProperty(value = "推进频率小时：提供计算使用")
 	private Long frequency;
 
+	@NoQuery
 	@TableField(exist=false)
 	@Excel(name = "是否超频率", width = 15)
 	@ApiModelProperty(value = "是否超频率:默认 false 没有超标；true表示超标")
@@ -133,5 +140,5 @@ public class MajorIssuesProcess {
 			}
 		}
 		return contrastFlag;
-	}
+	}*/
 }

@@ -3,7 +3,7 @@
 <mapper namespace="com.skua.modules.report.mapper.MajorIssuesProcessItemMapper">
 
     <update id="updateMajorIssuesProcess" >
-        update f_major_issues_process  set current_progress  = #{matterProgress} and current_progress_time = #{createTime}  where id = #{matterProcessId}
+        update f_major_issues_process  set current_progress  = #{matterProgress} , current_progress_time = now()  where id = #{matterProcessId}
     </update>
 
 </mapper>