Commit a423f572 by hzc

填报单位新增单位中文名称字段

parent 4ac0bcd6
...@@ -29,7 +29,11 @@ public class Constants { ...@@ -29,7 +29,11 @@ public class Constants {
public static final String LOG_INDICATOR_BASEDATACHECK = "indicator.basedatacheck"; public static final String LOG_INDICATOR_BASEDATACHECK = "indicator.basedatacheck";
public static final String LOG_INDICATOR_SHORTBOARD_TASK_API = "indicator.shortboardtask"; public static final String LOG_INDICATOR_SHORTBOARD_TASK_API = "indicator.shortboardtask";
public static final String LOG_INDICATOR_SHORTBOARD_RECORD_API = "indicator.shortboardrecord";
public static final String LOG_INDICATOR_SHORTBOARD_AUDIT_API = "indicator.shortboardaudit";
public static final String LOG_INDICATOR_UPLOAD_FILE_API = "indicator.uploadfile"; public static final String LOG_INDICATOR_UPLOAD_FILE_API = "indicator.uploadfile";
......
...@@ -44,7 +44,6 @@ public class TaskRuleGroupObj extends BaseModel { ...@@ -44,7 +44,6 @@ public class TaskRuleGroupObj extends BaseModel {
private String detail; private String detail;
@ApiModelProperty("单位内容,记录name用,分割") @ApiModelProperty("单位内容,记录name用,分割")
@Transient
private String detailNames; private String detailNames;
......
...@@ -77,7 +77,7 @@ public class ShortboardTaskService { ...@@ -77,7 +77,7 @@ public class ShortboardTaskService {
shortboardRecord.setIsIssue("1"); shortboardRecord.setIsIssue("1");
shortboardRecordMapper.updateByPrimaryKeySelective(shortboardRecord); shortboardRecordMapper.updateByPrimaryKeySelective(shortboardRecord);
String message = currentUser+":下发了短板,短板id:{}短板名:{}"; String message = currentUser+":下发了短板,短板id:{}短板名:{}";
LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message,shortBoardTask.getId(),shortBoardTask.getShortboardName()); LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_RECORD_API,message,shortBoardTask.getId(),shortBoardTask.getShortboardName());
} }
return Result.genOkResult(); return Result.genOkResult();
} }
...@@ -156,7 +156,7 @@ public class ShortboardTaskService { ...@@ -156,7 +156,7 @@ public class ShortboardTaskService {
shortBoardTask.setStatus(status); shortBoardTask.setStatus(status);
shortboardTaskMapper.updateByPrimaryKeySelective(shortBoardTask); shortboardTaskMapper.updateByPrimaryKeySelective(shortBoardTask);
String message = SystemUserUtil.getCurrentUser()+":把id={}的短板清单状态修改为{} "; String message = SystemUserUtil.getCurrentUser()+":把id={}的短板清单状态修改为{} ";
LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message,taskId,status); LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_AUDIT_API,message,taskId,status);
if(StringUtils.isNotBlank(description)){ if(StringUtils.isNotBlank(description)){
ShortBoardAuditRecord shortBoardAuditRecord = new ShortBoardAuditRecord(); ShortBoardAuditRecord shortBoardAuditRecord = new ShortBoardAuditRecord();
shortBoardAuditRecord.setDescription(description); shortBoardAuditRecord.setDescription(description);
......
...@@ -12,8 +12,9 @@ public enum ModelPathEnum { ...@@ -12,8 +12,9 @@ public enum ModelPathEnum {
LOG_INDICATOR_BASEDATACHECK("indicator.basedatacheck","数据项稽核"), LOG_INDICATOR_BASEDATACHECK("indicator.basedatacheck","数据项稽核"),
LOG_INDICATOR_SHORTBOARD_UNIT_API("indicator.shortboardunit","短板管理/短板规则"), LOG_INDICATOR_SHORTBOARD_UNIT_API("indicator.shortboardunit","短板管理/短板规则"),
LOG_INDICATOR_SHORTBOARD_TASK_API("indicator.shortboardtask","短板管理/短板清单"), LOG_INDICATOR_SHORTBOARD_TASK_API("indicator.shortboardtask","短板管理/短板清单"),
LOG_INDICATOR_UPLOAD_FILE_API("indicator.uploadfile","文件管理"); LOG_INDICATOR_UPLOAD_FILE_API("indicator.uploadfile","文件管理"),
LOG_INDICATOR_SHORTBOARD_RECORD_API("indicator.shortboardrecord","短板管理/短板预警池"),
LOG_INDICATOR_SHORTBOARD_AUDIT_API("indicator.shortboardaudit","短板管理/检查改善错误");
private String modelName; private String modelName;
private String modelPath; private String modelPath;
......
...@@ -51,9 +51,16 @@ ...@@ -51,9 +51,16 @@
<logger name="indicator.shortboardtask"> <logger name="indicator.shortboardtask">
<appender-ref ref="db" /> <appender-ref ref="db" />
</logger> </logger>
<logger name="indicator.shortboardrecord">
<appender-ref ref="db" />
</logger>
<logger name="indicator.shortboardaudit">
<appender-ref ref="db" />
</logger>
<logger name="indicator.uploadfile"> <logger name="indicator.uploadfile">
<appender-ref ref="db" /> <appender-ref ref="db" />
</logger> </logger>
<root level="INFO"> <root level="INFO">
<appender-ref ref="stdout" /> <appender-ref ref="stdout" />
</root> </root>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SELECT FROM_UNIXTIME(timestmp/1000,'%Y-%m-%d %H:%m:%s') as date_time, formatted_message, logger_name, arg0 as employee_id, arg2 as login_ip, arg3 as url, event_id SELECT FROM_UNIXTIME(timestmp/1000,'%Y-%m-%d %H:%m:%s') as date_time, formatted_message, logger_name, arg0 as employee_id, arg2 as login_ip, arg3 as url, event_id
FROM logging_event FROM logging_event
<include refid="findWhereSql"></include> <include refid="findWhereSql"></include>
order by timestmp desc
limit #{pageOff}, #{pageSize} limit #{pageOff}, #{pageSize}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment