end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加修改任务时间的单独接口

master
陈裕财 4 years ago
parent
0a752e57bd
commit
9c799ac97d
5 changed files with 21 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      .idea/xm-backend.iml
  2. 7
      xm-bootstrap/xm-bootstrap.iml
  3. 5
      xm-core/pom.xml
  4. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
  5. 10
      xm-core/xm-core.iml

6
.idea/xm-backend.iml
View File

@ -63,7 +63,6 @@
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" /> <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
@ -89,7 +88,7 @@
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
@ -116,6 +115,8 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-meta-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-meta-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.1" level="project" />
@ -133,6 +134,7 @@
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.1" level="project" />

7
xm-bootstrap/xm-bootstrap.iml
View File

@ -60,7 +60,6 @@
<orderEntry type="library" name="Maven: net.javacrumbs.json-unit:json-unit-json-path:2.19.0" level="project" /> <orderEntry type="library" name="Maven: net.javacrumbs.json-unit:json-unit-json-path:2.19.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-compiler:3.0.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-compiler:3.0.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-shade:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-shade:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-converters:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-converters:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-spec:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-spec:3.0.0" level="project" />
@ -129,7 +128,8 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" />
@ -194,7 +194,7 @@
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
@ -221,6 +221,7 @@
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.1" level="project" />

5
xm-core/pom.xml
View File

@ -24,6 +24,11 @@
<artifactId>mdp-tpa-client</artifactId> <artifactId>mdp-tpa-client</artifactId>
<version>${mdp.version}</version> <version>${mdp.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.mdp</groupId>
<artifactId>mdp-ds</artifactId>
<version>${mdp.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.mdp</groupId> <groupId>com.mdp</groupId>
<artifactId>mdp-oauth2-client</artifactId> <artifactId>mdp-oauth2-client</artifactId>

2
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
View File

@ -31,6 +31,7 @@
) )
</if> </if>
<if test="key != null and key !='' "> and res.product_name like #{key} </if> <if test="key != null and key !='' "> and res.product_name like #{key} </if>
<if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if>
</where> </where>
</select> </select>
@ -61,6 +62,7 @@
or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
) )
</if> </if>
<if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if>
</where> </where>
</select> </select>

10
xm-core/xm-core.iml
View File

@ -27,7 +27,6 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-tpa-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-tpa-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
@ -40,6 +39,11 @@
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" />
@ -77,7 +81,6 @@
<orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.reporter2:zipkin-reporter:2.16.1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.reporter2:zipkin-reporter:2.16.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.zipkin2:zipkin:2.23.0" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.zipkin2:zipkin:2.23.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.1" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.1" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.4.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.4.2" level="project" />
@ -109,7 +112,7 @@
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
@ -125,7 +128,6 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" /> <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />

Write Preview
Loading…
Cancel
Save