无关风月
2024-12-26 1e04b9c229b084cfc9824aeacdaac708d8c479c0
文件上传
1 文件已重命名
5个文件已修改
22 ■■■■ 已修改文件
common/src/main/java/com/jilongda/common/basic/Constant.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometrist/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometrist/src/main/java/com/jilongda/optometrist/OptometristApplication.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/src/main/java/com/jilongda/common/basic/Constant.java
@@ -115,6 +115,9 @@
            , "/logout"
            , "/cpe/**"//当前H5用户端不采用security
            , "/sales-report/**"//报表目前不做权限校验
            , "/sales-report/**"//报表目前不做权限校验
            , "/code/login"
            , "/sendMsg"
    };
    public static final String[] APPLET_AUTH_WHITELIST = {
            "/"
manage/src/main/java/com/jilongda/manage/controller/TOptometryController.java
@@ -61,6 +61,11 @@
        PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
        List<TOptometryVO> records = tOptometryVOPageInfo.getRecords();
        for (TOptometryVO record : records) {
            List<TOptometryDetail> list = optometryDetailService.lambdaQuery()
                    .eq(TOptometryDetail::getOptometryId, record.getId())
                    .eq(TOptometryDetail::getType,1)
                    .list();
            record.setList(list);
            if (record.getUserId()!=null){
                TAppUser byId = appUserService.getById(record.getUserId());
                if (byId!=null){
manage/src/main/java/com/jilongda/manage/vo/TOptometryVO.java
@@ -1,10 +1,13 @@
package com.jilongda.manage.vo;
import com.jilongda.manage.model.TOptometry;
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TSupplier;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(value = "验光单VO")
@@ -21,5 +24,6 @@
    private String pupilDistance;
    @ApiModelProperty(value = "验光师名称")
    private String optometristName;
    @ApiModelProperty(value = "验光单详情")
    private List<TOptometryDetail> list;
}
optometrist/pom.xml
@@ -90,7 +90,7 @@
                            <artifactId>lombok</artifactId>
                        </exclude>
                    </excludes>
                    <mainClass>com.jilongda.optometrist.ManageApplication</mainClass>
                    <mainClass>com.jilongda.optometrist.OptometristApplication</mainClass>
                </configuration>
            </plugin>
optometrist/src/main/java/com/jilongda/optometrist/OptometristApplication.java
File was renamed from optometrist/src/main/java/com/jilongda/optometrist/ManageApplication.java
@@ -25,10 +25,10 @@
@MapperScan({"com.jilongda.optometrist.mapper", "com.jilongda.optometrist.authority.mapper"})
@EnableTransactionManagement
@SpringBootApplication
public class ManageApplication {
public class OptometristApplication {
    public static void main(String[] args) throws UnknownHostException {
        ConfigurableApplicationContext application = SpringApplication.run(ManageApplication.class, args);
        ConfigurableApplicationContext application = SpringApplication.run(OptometristApplication.class, args);
        Environment env = application.getEnvironment();
        log.info("\n----------------------------------------------------------\n\t" +
                        "应用 '{}' 运行成功! 访问连接:\n\t" +
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -78,6 +78,8 @@
        SecUser byId = secUserService.getById(userId);
        TStore byId1 = storeService.getById(byId.getStoreId());
        tOptometristVO.setStoreName(byId1.getName());
        tOptometristVO.setName(byId.getNickName());
        tOptometristVO.setPhone(byId.getPhone());
        int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
                .eq(TOptometry::getStatus, 3).list().size();
        tOptometristVO.setOptometryCount(size);