Commit 5e941e13eba0441ce6ac6731a0703ec0f9409d34
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
View file @
5e941e1
| ... | ... | @@ -68,13 +68,13 @@ |
| 68 | 68 | //处理意见 |
| 69 | 69 | private String treatOpinion; |
| 70 | 70 | |
| 71 | - private boolean isOpinion; | |
| 71 | + private Boolean isOpinion; | |
| 72 | 72 | |
| 73 | - public boolean isOpinion() { | |
| 73 | + public Boolean getIsOpinion() { | |
| 74 | 74 | return isOpinion; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public void setIsOpinion(boolean isOpinion) { | |
| 77 | + public void setIsOpinion(Boolean isOpinion) { | |
| 78 | 78 | this.isOpinion = isOpinion; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | |
| ... | ... | @@ -577,21 +577,23 @@ |
| 577 | 577 | |
| 578 | 578 | Criteria c = null; |
| 579 | 579 | |
| 580 | - if (isOpinion) | |
| 580 | + if (isOpinion != null) | |
| 581 | 581 | { |
| 582 | - if (null != treatOpinion) { | |
| 583 | - condition = condition.and("treatOpinion", treatOpinion, MongoOper.LIKE); | |
| 582 | + if (isOpinion) | |
| 583 | + { | |
| 584 | + if (null != treatOpinion) { | |
| 585 | + condition = condition.and("treatOpinion", treatOpinion, MongoOper.LIKE); | |
| 586 | + } | |
| 587 | + else | |
| 588 | + { | |
| 589 | + condition = condition.and("treatOpinion", null, MongoOper.NE); | |
| 590 | + } | |
| 584 | 591 | } |
| 585 | 592 | else |
| 586 | 593 | { |
| 587 | - condition = condition.and("treatOpinion", null, MongoOper.NE); | |
| 594 | + condition = condition.and("treatOpinion", false, MongoOper.EXISTS); | |
| 588 | 595 | } |
| 589 | 596 | } |
| 590 | - else | |
| 591 | - { | |
| 592 | - condition = condition.and("treatOpinion", false, MongoOper.EXISTS); | |
| 593 | - } | |
| 594 | - | |
| 595 | 597 | |
| 596 | 598 | if (null != buildTimeStart) { |
| 597 | 599 | c = Criteria.where("buildTime").gte(buildTimeStart); |
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
View file @
5e941e1
| ... | ... | @@ -248,6 +248,23 @@ |
| 248 | 248 | </bean> |
| 249 | 249 | |
| 250 | 250 | |
| 251 | + <!-- 快速测量定时任务 --> | |
| 252 | + <bean id="zcChanJianWorker" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> | |
| 253 | + <!-- 要调用的bean --> | |
| 254 | + <property name="targetObject" ref="zcPrenatalService"></property> | |
| 255 | + <!-- 要调用的Method --> | |
| 256 | + <property name="targetMethod" value="handleWork"></property> | |
| 257 | + <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 --> | |
| 258 | + <property name="concurrent" value="false"></property> | |
| 259 | + </bean> | |
| 260 | + | |
| 261 | + | |
| 262 | + <bean id="zcChanJianTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> | |
| 263 | + <property name="jobDetail" ref="zcChanJianWorker"></property> | |
| 264 | + <property name="cronExpression" value="0 0 0/1 * * ?"></property> | |
| 265 | + </bean> | |
| 266 | + | |
| 267 | + | |
| 251 | 268 | <!-- 总调度,用于启动定时器 --> |
| 252 | 269 | <bean id="schedulerFactory" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> |
| 253 | 270 | <property name="triggers" > |
| ... | ... | @@ -271,6 +288,8 @@ |
| 271 | 288 | <!--<ref bean="dzfyFmTrigger"/>--> |
| 272 | 289 | <!--<ref bean="crisisTrigger"/>--> |
| 273 | 290 | <!--<ref bean="qhdFmHistoryTrigger"/>--> |
| 291 | + | |
| 292 | + <ref bean="zcChanJianTrigger"/> | |
| 274 | 293 | </list> |
| 275 | 294 | </property> |
| 276 | 295 | </bean> |