java110
2020-09-21 cdc4c8448beb5ee41fcf58bb01712344e82fd137
优化代码
3个文件已修改
25 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/api/ContractApi.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
@@ -43,6 +43,7 @@
    private String statusCd = "0";
    private String contractTypeName;
    private String stateName;
    private List<ContractAttrDto> attrs;
@@ -237,4 +238,12 @@
    public void setContractTypeName(String contractTypeName) {
        this.contractTypeName = contractTypeName;
    }
    public String getStateName() {
        return stateName;
    }
    public void setStateName(String stateName) {
        this.stateName = stateName;
    }
}
java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml
@@ -24,9 +24,10 @@
        partyB,t.contract_id,t.contract_id contractId,t.obj_id,t.obj_id objId,t.contract_name,t.contract_name
        contractName,t.start_time,t.start_time startTime,t.end_time,t.end_time
        endTime,t.state,t.contract_code,t.contract_code contractCode,t.obj_type,t.obj_type
        objType,t.operator_link,t.operator_link operatorLink,ct.type_name contractTypeName
        objType,t.operator_link,t.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName
        from contract t
        LEFT JOIN contract_type ct on t.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = t.store_id
        LEFT JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract' and td.table_columns = 'state'
        where 1 =1
        <if test="aLink !=null and aLink != ''">
            and t.a_link= #{aLink}
service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -29,12 +29,7 @@
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -109,7 +104,7 @@
        ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
        contractPo.setStoreId(storeId);
        return saveContractBMOImpl.save(contractPo,reqJson);
        return saveContractBMOImpl.save(contractPo, reqJson);
    }
    /**
@@ -141,7 +136,7 @@
        ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
        return updateContractBMOImpl.update(contractPo,reqJson);
        return updateContractBMOImpl.update(contractPo, reqJson);
    }
    /**
@@ -173,12 +168,14 @@
     */
    @RequestMapping(value = "/queryContract", method = RequestMethod.GET)
    public ResponseEntity<String> queryContract(@RequestHeader(value = "store-id") String storeId,
                                                @RequestParam(value = "state") String state,
                                                @RequestParam(value = "page") int page,
                                                @RequestParam(value = "row") int row) {
        ContractDto contractDto = new ContractDto();
        contractDto.setPage(page);
        contractDto.setRow(row);
        contractDto.setStoreId(storeId);
        contractDto.setState(state);
        return getContractBMOImpl.get(contractDto);
    }